MacTech 1 to 12

home *** CD-ROM | disk | FTP | other *** search
/ MacTech 1 to 12 / MacTech-vol-1-12.toast / Source / develop™ Technical Journal / develop Issue 28 code / Merge_Tools.sit / Merge Tools / !README next >
MacBinary | 1996-09-25 | 14.3 KB | [TEXT/MPS ]
open in:
MacOS 8.1 extracted |
Win98 extracted |
DOS extracted
browse contents |
view JSON data |
view as text

This file was processed as: MacBinary (archive/macBinary).
Confidence	Program	Detection	Match Type	Support
`10%`	dexvert	MacBinary `(archive/macBinary)`	fallback	Supported
`1%`	dexvert	Text File `(text/txt)`	fallback	Supported
`100%`	file	MacBinary II, inited, Wed Sep 25 12:18:24 1996, modified Wed Sep 25 12:18:24 1996, creator 'MPS ', type ASCII, 13924 bytes "!README" , at 0x36e4 456 bytes resource	default (weak)
`99%`	file	data	default
`74%`	TrID	Macintosh plain text (MacBinary)	default
`25%`	TrID	MacBinary 2	default (weak)
`100%`	siegfried	fmt/1762 MacBinary (II)	default
`100%`	lsar	MacBinary	default
id metadata
key	value
macFileType	`[TEXT]`
macFileCreator	`[MPS ]`
hex view
+--------+-------------------------+-------------------------+--------+--------+
|00000000| 00 07 21 52 45 41 44 4d | 45 00 00 00 00 00 00 00 |..!READM|E.......|
|00000010| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000020| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000030| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000040| 00 54 45 58 54 4d 50 53 | 20 01 00 00 00 00 00 00 |.TEXTMPS| .......|
|00000050| 00 00 00 00 00 36 64 00 | 00 01 c8 ae 6f 0b d0 ae |.....6d.|....o...|
|00000060| 6f 0b d0 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |o.......|........|
|00000070| 00 00 00 00 00 00 00 00 | 00 00 81 81 d6 a5 00 00 |........|........|
|00000080| 54 68 69 73 20 64 69 72 | 65 63 74 6f 72 79 20 63 |This dir|ectory c|
|00000090| 6f 6e 74 61 69 6e 73 20 | 74 68 65 20 45 63 6c 65 |ontains |the Ecle|
|000000a0| 63 74 75 73 20 6d 65 72 | 67 65 20 75 74 69 6c 69 |ctus mer|ge utili|
|000000b0| 74 69 65 73 0d 43 6f 70 | 79 72 69 67 68 74 20 28 |ties.Cop|yright (|
|000000c0| 43 29 20 31 39 39 32 2d | 39 36 20 45 63 6c 65 63 |C) 1992-|96 Eclec|
|000000d0| 74 75 73 20 28 44 2e 20 | 4a 6f 68 6e 20 41 6e 64 |tus (D. |John And|
|000000e0| 65 72 73 6f 6e 2c 20 41 | 6c 61 6e 20 42 2e 20 48 |erson, A|lan B. H|
|000000f0| 61 72 70 65 72 29 2e 0d | 0d 45 63 6c 65 63 74 75 |arper)..|.Eclectu|
|00000100| 73 20 6d 65 72 67 65 20 | 75 74 69 6c 69 74 69 65 |s merge |utilitie|
|00000110| 73 20 61 72 65 20 66 72 | 65 65 20 73 6f 66 74 77 |s are fr|ee softw|
|00000120| 61 72 65 3b 20 79 6f 75 | 20 63 61 6e 20 72 65 64 |are; you| can red|
|00000130| 69 73 74 72 69 62 75 74 | 65 0d 74 68 65 6d 20 61 |istribut|e.them a|
|00000140| 6e 64 2f 6f 72 20 6d 6f | 64 69 66 79 20 74 68 65 |nd/or mo|dify the|
|00000150| 6d 20 75 6e 64 65 72 20 | 74 68 65 20 74 65 72 6d |m under |the term|
|00000160| 73 20 6f 66 20 74 68 65 | 20 47 4e 55 20 47 65 6e |s of the| GNU Gen|
|00000170| 65 72 61 6c 20 50 75 62 | 6c 69 63 20 4c 69 63 65 |eral Pub|lic Lice|
|00000180| 6e 73 65 0d 61 73 20 70 | 75 62 6c 69 73 68 65 64 |nse.as p|ublished|
|00000190| 20 62 79 20 74 68 65 20 | 46 72 65 65 20 53 6f 66 | by the |Free Sof|
|000001a0| 74 77 61 72 65 20 46 6f | 75 6e 64 61 74 69 6f 6e |tware Fo|undation|
|000001b0| 3b 20 65 69 74 68 65 72 | 20 76 65 72 73 69 6f 6e |; either| version|
|000001c0| 20 31 2c 20 6f 72 0d 28 | 61 74 20 79 6f 75 72 20 | 1, or.(|at your |
|000001d0| 6f 70 74 69 6f 6e 29 20 | 61 6e 79 20 6c 61 74 65 |option) |any late|
|000001e0| 72 20 76 65 72 73 69 6f | 6e 2e 0d 0d 45 63 6c 65 |r versio|n...Ecle|
|000001f0| 63 74 75 73 20 6d 65 72 | 67 65 20 75 74 69 6c 69 |ctus mer|ge utili|
|00000200| 74 69 65 73 20 61 72 65 | 20 64 69 73 74 72 69 62 |ties are| distrib|
|00000210| 75 74 65 64 20 69 6e 20 | 74 68 65 20 68 6f 70 65 |uted in |the hope|
|00000220| 20 74 68 61 74 20 74 68 | 65 79 0d 77 69 6c 6c 20 | that th|ey.will |
|00000230| 62 65 20 75 73 65 66 75 | 6c 2c 20 62 75 74 20 57 |be usefu|l, but W|
|00000240| 49 54 48 4f 55 54 20 41 | 4e 59 20 57 41 52 52 41 |ITHOUT A|NY WARRA|
|00000250| 4e 54 59 3b 20 77 69 74 | 68 6f 75 74 20 65 76 65 |NTY; wit|hout eve|
|00000260| 6e 20 74 68 65 20 69 6d | 70 6c 69 65 64 0d 77 61 |n the im|plied.wa|
|00000270| 72 72 61 6e 74 79 20 6f | 66 20 4d 45 52 43 48 41 |rranty o|f MERCHA|
|00000280| 4e 54 41 42 49 4c 49 54 | 59 20 6f 72 20 46 49 54 |NTABILIT|Y or FIT|
|00000290| 4e 45 53 53 20 46 4f 52 | 20 41 20 50 41 52 54 49 |NESS FOR| A PARTI|
|000002a0| 43 55 4c 41 52 20 50 55 | 52 50 4f 53 45 2e 0d 53 |CULAR PU|RPOSE..S|
|000002b0| 65 65 20 74 68 65 20 47 | 4e 55 20 47 65 6e 65 72 |ee the G|NU Gener|
|000002c0| 61 6c 20 50 75 62 6c 69 | 63 20 4c 69 63 65 6e 73 |al Publi|c Licens|
|000002d0| 65 20 66 6f 72 20 6d 6f | 72 65 20 64 65 74 61 69 |e for mo|re detai|
|000002e0| 6c 73 2e 0d 0d 59 6f 75 | 20 73 68 6f 75 6c 64 20 |ls...You| should |
|000002f0| 68 61 76 65 20 72 65 63 | 65 69 76 65 64 20 61 20 |have rec|eived a |
|00000300| 63 6f 70 79 20 6f 66 20 | 74 68 65 20 47 4e 55 20 |copy of |the GNU |
|00000310| 47 65 6e 65 72 61 6c 20 | 50 75 62 6c 69 63 20 4c |General |Public L|
|00000320| 69 63 65 6e 73 65 0d 61 | 6c 6f 6e 67 20 77 69 74 |icense.a|long wit|
|00000330| 68 20 74 68 65 20 45 63 | 6c 65 63 74 75 73 20 6d |h the Ec|lectus m|
|00000340| 65 72 67 65 20 75 74 69 | 6c 69 74 69 65 73 3b 20 |erge uti|lities; |
|00000350| 73 65 65 20 74 68 65 20 | 66 69 6c 65 20 43 4f 50 |see the |file COP|
|00000360| 59 49 4e 47 2e 0d 49 66 | 20 6e 6f 74 2c 20 77 72 |YING..If| not, wr|
|00000370| 69 74 65 20 74 6f 20 74 | 68 65 20 46 72 65 65 20 |ite to t|he Free |
|00000380| 53 6f 66 74 77 61 72 65 | 20 46 6f 75 6e 64 61 74 |Software| Foundat|
|00000390| 69 6f 6e 2c 20 36 37 35 | 20 4d 61 73 73 20 41 76 |ion, 675| Mass Av|
|000003a0| 65 2c 20 43 61 6d 62 72 | 69 64 67 65 2c 0d 4d 41 |e, Cambr|idge,.MA|
|000003b0| 20 30 32 31 33 39 2c 20 | 55 53 41 2e 0d 0d 54 68 | 02139, |USA...Th|
|000003c0| 69 73 20 76 65 72 73 69 | 6f 6e 20 77 61 73 20 72 |is versi|on was r|
|000003d0| 65 6c 65 61 73 65 64 20 | 6f 6e 20 57 65 64 6e 65 |eleased |on Wedne|
|000003e0| 73 64 61 79 2c 20 53 65 | 70 74 65 6d 62 65 72 20 |sday, Se|ptember |
|000003f0| 32 35 2c 20 31 39 39 36 | 2e 0d 0d 54 68 65 73 65 |25, 1996|...These|
|00000400| 20 33 20 75 74 69 6c 69 | 74 69 65 73 2d 2d 4d 65 | 3 utili|ties--Me|
|00000410| 72 67 65 2c 20 44 69 66 | 66 65 72 65 6e 63 65 2c |rge, Dif|ference,|
|00000420| 20 61 6e 64 20 55 6e 64 | 69 66 66 65 72 65 6e 63 | and Und|ifferenc|
|00000430| 65 2d 2d 6d 61 6b 65 20 | 69 74 20 65 61 73 79 0d |e--make |it easy.|
|00000440| 66 6f 72 20 6d 61 6e 79 | 20 64 65 76 65 6c 6f 70 |for many| develop|
|00000450| 65 72 73 20 74 6f 20 77 | 6f 72 6b 20 6f 6e 20 74 |ers to w|ork on t|
|00000460| 68 65 20 73 61 6d 65 20 | 63 6f 64 65 20 62 61 73 |he same |code bas|
|00000470| 65 2e 0d 0d 53 74 61 72 | 74 20 77 69 74 68 20 61 |e...Star|t with a|
|00000480| 20 63 6f 6d 70 6c 65 74 | 65 20 63 6f 70 79 20 6f | complet|e copy o|
|00000490| 66 20 79 6f 75 72 20 73 | 6f 75 72 63 65 20 63 6f |f your s|ource co|
|000004a0| 64 65 2e 20 54 68 69 73 | 20 63 6f 70 79 20 69 73 |de. This| copy is|
|000004b0| 20 63 61 6c 6c 65 64 0d | 74 68 65 20 62 61 73 65 | called.|the base|
|000004c0| 2c 20 77 68 69 63 68 20 | 66 6f 72 20 74 68 69 73 |, which |for this|
|000004d0| 20 65 78 61 6d 70 6c 65 | 20 77 65 27 6c 6c 20 61 | example| we'll a|
|000004e0| 73 73 75 6d 65 20 69 73 | 20 69 6e 20 74 68 65 20 |ssume is| in the |
|000004f0| 64 69 72 65 63 74 6f 72 | 79 0d 74 72 65 65 20 6e |director|y.tree n|
|00000500| 61 6d 65 64 20 45 43 2d | 30 2e 20 57 65 20 77 72 |amed EC-|0. We wr|
|00000510| 69 74 65 2d 70 72 6f 74 | 65 63 74 20 61 6c 6c 20 |ite-prot|ect all |
|00000520| 74 68 65 20 66 69 6c 65 | 73 20 69 6e 20 45 43 2d |the file|s in EC-|
|00000530| 30 20 61 6e 64 20 70 75 | 74 20 69 74 0d 69 6e 20 |0 and pu|t it.in |
|00000540| 61 20 70 75 62 6c 69 63 | 20 70 6c 61 63 65 2e 20 |a public| place. |
|00000550| 45 61 63 68 20 64 65 76 | 65 6c 6f 70 65 72 20 6d |Each dev|eloper m|
|00000560| 61 6b 65 73 20 61 20 70 | 65 72 73 6f 6e 61 6c 20 |akes a p|ersonal |
|00000570| 77 72 69 74 65 2d 65 6e | 61 62 6c 65 64 0d 63 6f |write-en|abled.co|
|00000580| 70 79 20 6f 66 20 45 43 | 2d 30 2c 20 6e 61 6d 65 |py of EC|-0, name|
|00000590| 64 20 45 43 20 6f 6e 20 | 74 68 65 69 72 20 6f 77 |d EC on |their ow|
|000005a0| 6e 20 6d 61 63 68 69 6e | 65 2e 20 54 68 65 79 20 |n machin|e. They |
|000005b0| 6d 61 6b 65 20 61 6c 6c | 20 74 68 65 69 72 20 63 |make all| their c|
|000005c0| 68 61 6e 67 65 73 0d 74 | 6f 20 74 68 65 69 72 20 |hanges.t|o their |
|000005d0| 70 65 72 73 6f 6e 61 6c | 20 63 6f 70 79 2e 20 57 |personal| copy. W|
|000005e0| 68 65 6e 20 65 76 65 72 | 79 6f 6e 65 20 61 67 72 |hen ever|yone agr|
|000005f0| 65 65 73 20 74 68 61 74 | 20 74 68 65 69 72 20 63 |ees that| their c|
|00000600| 68 61 6e 67 65 73 20 61 | 72 65 0d 72 65 61 64 79 |hanges a|re.ready|
|00000610| 20 74 6f 20 6d 65 72 67 | 65 20 69 6e 74 6f 20 61 | to merg|e into a|
|00000620| 20 6e 65 77 20 62 61 73 | 65 20 77 65 20 75 73 65 | new bas|e we use|
|00000630| 20 4d 65 72 67 65 20 74 | 6f 20 6d 65 72 67 65 20 | Merge t|o merge |
|00000640| 65 61 63 68 0d 64 65 72 | 69 76 65 64 20 63 6f 70 |each.der|ived cop|
|00000650| 79 20 69 6e 74 6f 20 45 | 43 2d 30 20 61 6e 64 20 |y into E|C-0 and |
|00000660| 63 72 65 61 74 65 20 61 | 20 6e 65 77 20 62 61 73 |create a| new bas|
|00000670| 65 20 63 61 6c 6c 65 64 | 20 45 43 2d 31 2c 20 77 |e called| EC-1, w|
|00000680| 68 69 63 68 0d 65 76 65 | 72 79 6f 6e 65 20 63 6f |hich.eve|ryone co|
|00000690| 70 69 65 73 20 61 6e 64 | 20 64 65 76 65 6c 6f 70 |pies and| develop|
|000006a0| 6d 65 6e 74 20 63 6f 6e | 74 69 6e 75 65 73 2e 0d |ment con|tinues..|
|000006b0| 0d 54 68 69 73 20 68 61 | 73 20 61 6e 20 61 64 76 |.This ha|s an adv|
|000006c0| 61 6e 74 61 67 65 20 6f | 76 65 72 20 74 68 65 20 |antage o|ver the |
|000006d0| 74 72 61 64 69 74 69 6f | 6e 61 6c 20 22 63 68 65 |traditio|nal "che|
|000006e0| 63 6b 2d 69 6e 2f 63 68 | 65 63 6b 2d 6f 75 74 22 |ck-in/ch|eck-out"|
|000006f0| 0d 61 70 70 72 6f 61 63 | 68 20 69 6e 20 74 68 61 |.approac|h in tha|
|00000700| 74 20 6d 6f 72 65 20 74 | 68 61 6e 20 6f 6e 20 70 |t more t|han on p|
|00000710| 65 72 73 6f 6e 20 63 61 | 6e 20 6d 6f 64 69 66 79 |erson ca|n modify|
|00000720| 20 61 20 66 69 6c 65 20 | 61 74 20 74 68 65 20 73 | a file |at the s|
|00000730| 61 6d 65 20 74 69 6d 65 | 2e 0d 49 20 77 61 73 20 |ame time|..I was |
|00000740| 69 6e 74 72 6f 64 75 63 | 65 64 20 74 6f 20 74 68 |introduc|ed to th|
|00000750| 69 73 20 61 70 70 72 6f | 61 63 68 20 62 79 20 4d |is appro|ach by M|
|00000760| 69 6b 65 20 44 65 6d 6f | 6e 79 20 77 68 6f 20 64 |ike Demo|ny who d|
|00000770| 65 76 65 6c 6f 70 65 64 | 20 69 74 20 61 74 0d 4d |eveloped| it at.M|
|00000780| 49 50 53 20 61 6e 64 20 | 6c 61 74 65 72 20 70 72 |IPS and |later pr|
|00000790| 6f 6d 6f 74 65 64 20 69 | 74 20 61 74 20 4e 65 58 |omoted i|t at NeX|
|000007a0| 54 2e 20 4f 75 72 20 65 | 78 70 65 72 69 65 6e 63 |T. Our e|xperienc|
|000007b0| 65 20 64 75 72 69 6e 67 | 20 74 68 65 20 6c 61 73 |e during| the las|
|000007c0| 74 0d 31 30 20 79 65 61 | 72 73 20 63 6f 6e 76 69 |t.10 yea|rs convi|
|000007d0| 6e 63 65 64 20 6d 65 20 | 74 68 61 74 20 69 74 20 |nced me |that it |
|000007e0| 69 73 20 6d 75 63 68 20 | 6d 6f 72 65 20 65 66 66 |is much |more eff|
|000007f0| 69 63 69 65 6e 74 20 74 | 68 61 74 20 74 68 65 20 |icient t|hat the |
|00000800| 74 72 61 64 69 74 69 6f | 6e 61 6c 0d 61 70 70 72 |traditio|nal.appr|
|00000810| 6f 61 63 68 2c 20 65 73 | 70 65 63 69 61 6c 6c 79 |oach, es|pecially|
|00000820| 20 69 6e 20 74 68 65 20 | 65 61 72 6c 79 20 73 74 | in the |early st|
|00000830| 61 67 65 73 20 6f 66 20 | 64 65 76 65 6c 6f 70 6d |ages of |developm|
|00000840| 65 6e 74 2e 20 49 74 20 | 61 6c 73 6f 20 68 61 73 |ent. It |also has|
|00000850| 0d 74 68 65 20 61 64 76 | 61 6e 74 61 67 65 20 6f |.the adv|antage o|
|00000860| 66 20 75 73 69 6e 67 20 | 74 68 65 20 66 69 6c 65 |f using |the file|
|00000870| 20 73 79 73 74 65 6d 20 | 66 6f 72 20 73 74 6f 72 | system |for stor|
|00000880| 69 6e 67 20 74 68 65 20 | 66 69 6c 65 73 2e 0d 0d |ing the |files...|
|00000890| 54 68 65 72 65 20 61 72 | 65 20 74 77 6f 20 6f 74 |There ar|e two ot|
|000008a0| 68 65 72 20 70 72 6f 67 | 72 61 6d 73 2c 20 44 69 |her prog|rams, Di|
|000008b0| 66 66 65 72 65 6e 63 65 | 20 61 6e 64 20 55 6e 64 |fference| and Und|
|000008c0| 69 66 66 65 72 65 6e 63 | 65 2c 20 74 68 61 74 20 |ifferenc|e, that |
|000008d0| 73 74 6f 72 65 0d 6f 6e | 6c 79 20 74 68 65 20 63 |store.on|ly the c|
|000008e0| 68 61 6e 67 65 73 20 62 | 65 74 77 65 65 6e 20 74 |hanges b|etween t|
|000008f0| 77 6f 20 73 6f 75 72 63 | 65 20 74 72 65 65 73 20 |wo sourc|e trees |
|00000900| 28 65 2e 67 2e 20 45 43 | 2d 30 20 61 6e 64 20 45 |(e.g. EC|-0 and E|
|00000910| 43 2d 31 29 2e 20 57 65 | 0d 75 73 65 20 74 68 65 |C-1). We|.use the|
|00000920| 73 65 20 70 72 6f 67 72 | 61 6d 73 20 74 6f 20 73 |se progr|ams to s|
|00000930| 74 6f 72 65 20 73 75 63 | 63 65 73 73 69 76 65 20 |tore suc|cessive |
|00000940| 76 65 72 73 69 6f 6e 73 | 20 69 6e 20 61 20 6d 6f |versions| in a mo|
|00000950| 72 65 20 63 6f 6d 70 61 | 63 74 20 66 6f 72 6d 2e |re compa|ct form.|
|00000960| 0d 49 74 20 63 61 6e 20 | 61 6c 73 6f 20 62 65 20 |.It can |also be |
|00000970| 75 73 65 64 20 74 6f 20 | 65 61 73 69 6c 79 20 65 |used to |easily e|
|00000980| 78 63 68 61 6e 67 65 20 | 76 65 72 73 69 6f 6e 73 |xchange |versions|
|00000990| 20 61 63 72 6f 73 73 20 | 64 69 66 66 65 72 65 6e | across |differen|
|000009a0| 74 20 70 6c 61 74 66 6f | 72 6d 73 0d 28 65 2e 67 |t platfo|rms.(e.g|
|000009b0| 2e 20 57 69 6e 64 6f 77 | 73 2c 20 4d 61 63 69 6e |. Window|s, Macin|
|000009c0| 74 6f 73 68 20 61 6e 64 | 20 4e 65 58 54 29 2e 20 |tosh and| NeXT). |
|000009d0| 59 6f 75 20 6d 61 79 20 | 66 69 6e 64 20 74 68 65 |You may |find the|
|000009e0| 6d 20 75 73 65 66 75 6c | 20 66 6f 72 20 62 72 69 |m useful| for bri|
|000009f0| 6e 67 69 6e 67 0d 63 6f | 70 69 65 73 20 6f 66 20 |nging.co|pies of |
|00000a00| 79 6f 75 72 20 70 72 6f | 6a 65 63 74 20 68 6f 6d |your pro|ject hom|
|00000a10| 65 20 6f 6e 20 61 20 66 | 6c 6f 70 70 79 20 6f 72 |e on a f|loppy or|
|00000a20| 20 65 6d 61 69 6c 69 6e | 67 20 79 6f 75 72 20 73 | emailin|g your s|
|00000a30| 6f 75 72 63 65 20 74 6f | 20 61 0d 63 6f 2d 77 6f |ource to| a.co-wo|
|00000a40| 72 6b 65 72 20 77 68 6f | 20 61 6c 72 65 61 64 79 |rker who| already|
|00000a50| 20 68 61 73 20 61 20 63 | 6f 70 79 20 6f 66 20 74 | has a c|opy of t|
|00000a60| 68 65 20 62 61 73 65 2e | 0d 0d 54 68 65 73 65 20 |he base.|..These |
|00000a70| 70 72 6f 67 72 61 6d 73 | 20 68 61 76 65 20 62 65 |programs| have be|
|00000a80| 65 6e 20 75 73 65 64 20 | 65 78 74 65 6e 73 69 76 |en used |extensiv|
|00000a90| 65 6c 79 20 6f 6e 20 4d | 61 63 69 6e 74 6f 73 68 |ely on M|acintosh|
|00000aa0| 20 61 6e 64 20 57 69 6e | 64 6f 77 73 20 66 6f 72 | and Win|dows for|
|00000ab0| 20 6d 61 6e 79 0d 79 65 | 61 72 73 2e 0d 0d 54 68 | many.ye|ars...Th|
|00000ac0| 65 79 20 63 75 72 72 65 | 6e 74 6c 79 20 72 75 6e |ey curre|ntly run|
|00000ad0| 20 6f 6e 20 57 69 6e 64 | 6f 77 73 20 4e 54 2c 20 | on Wind|ows NT, |
|00000ae0| 4d 61 63 69 6e 74 6f 73 | 68 20 61 6e 64 20 4e 65 |Macintos|h and Ne|
|00000af0| 58 54 2e 20 54 68 65 79 | 20 61 72 65 20 73 6d 61 |XT. They| are sma|
|00000b00| 6c 6c 0d 77 68 69 63 68 | 20 6d 61 6b 65 73 20 74 |ll.which| makes t|
|00000b10| 68 65 6d 20 65 61 73 79 | 20 74 6f 20 6d 61 69 6e |hem easy| to main|
|00000b20| 74 61 69 6e 20 61 6e 64 | 20 66 61 73 74 20 74 6f |tain and| fast to|
|00000b30| 20 65 78 65 63 75 74 65 | 2e 20 54 68 65 79 20 63 | execute|. They c|
|00000b40| 61 6e 20 65 61 73 69 6c | 79 0d 62 65 20 70 6f 72 |an easil|y.be por|
|00000b50| 74 65 64 20 74 6f 20 6f | 74 68 65 72 20 65 6e 76 |ted to o|ther env|
|00000b60| 69 72 6f 6e 6d 65 6e 74 | 73 2e 0d 0d 54 68 65 20 |ironment|s...The |
|00000b70| 64 69 73 74 72 69 62 75 | 74 69 6f 6e 20 63 6f 6e |distribu|tion con|
|00000b80| 74 61 69 6e 73 20 72 65 | 6c 65 61 73 65 20 65 78 |tains re|lease ex|
|00000b90| 65 63 75 74 61 62 6c 65 | 73 2c 20 64 65 62 75 67 |ecutable|s, debug|
|00000ba0| 67 69 6e 67 20 65 78 65 | 63 75 74 61 62 6c 65 73 |ging exe|cutables|
|00000bb0| 2c 20 61 6e 64 20 0d 73 | 6f 75 72 63 65 20 63 6f |, and .s|ource co|
|00000bc0| 64 65 20 66 6f 72 20 62 | 75 69 6c 64 69 6e 67 20 |de for b|uilding |
|00000bd0| 74 68 65 20 72 65 6c 65 | 61 73 65 20 65 78 65 63 |the rele|ase exec|
|00000be0| 75 74 61 62 6c 65 73 2e | 0d 0d 52 65 6c 65 61 73 |utables.|..Releas|
|00000bf0| 65 20 76 65 72 73 69 6f | 6e 73 20 66 6f 72 20 57 |e versio|ns for W|
|00000c00| 69 6e 64 6f 77 73 20 61 | 72 65 3a 0d 09 57 69 6e |indows a|re:..Win|
|00000c10| 54 6f 6f 6c 73 5c 44 69 | 66 66 65 72 65 6e 63 65 |Tools\Di|fference|
|00000c20| 2e 65 78 65 0d 09 57 69 | 6e 54 6f 6f 6c 73 5c 4d |.exe..Wi|nTools\M|
|00000c30| 65 72 67 65 2e 65 78 65 | 0d 09 57 69 6e 54 6f 6f |erge.exe|..WinToo|
|00000c40| 6c 73 5c 55 6e 64 69 66 | 66 65 72 65 6e 63 65 2e |ls\Undif|ference.|
|00000c50| 65 78 65 0d 0d 44 65 62 | 75 67 20 76 65 72 73 6f |exe..Deb|ug verso|
|00000c60| 6e 73 20 61 72 65 3a 0d | 09 57 69 6e 54 6f 6f 6c |ns are:.|.WinTool|
|00000c70| 73 5c 44 69 66 66 65 72 | 65 6e 63 65 44 65 62 75 |s\Differ|enceDebu|
|00000c80| 67 2e 65 78 65 0d 09 57 | 69 6e 54 6f 6f 6c 73 5c |g.exe..W|inTools\|
|00000c90| 4d 65 72 67 65 44 65 62 | 75 67 2e 65 78 65 0d 09 |MergeDeb|ug.exe..|
|00000ca0| 57 69 6e 54 6f 6f 6c 73 | 5c 55 6e 64 69 66 66 65 |WinTools|\Undiffe|
|00000cb0| 72 65 6e 63 65 44 65 62 | 75 67 2e 65 78 65 0d 0d |renceDeb|ug.exe..|
|00000cc0| 52 65 6c 65 61 73 65 20 | 76 65 72 73 69 6f 6e 73 |Release |versions|
|00000cd0| 20 66 6f 72 20 4d 61 63 | 69 6e 74 6f 73 68 20 61 | for Mac|intosh a|
|00000ce0| 72 65 3a 0d 09 3a 4d 61 | 63 54 6f 6f 6c 73 3a 44 |re:..:Ma|cTools:D|
|00000cf0| 69 66 66 65 72 65 6e 63 | 65 2e 6d 70 77 0d 09 3a |ifferenc|e.mpw..:|
|00000d00| 4d 61 63 54 6f 6f 6c 73 | 3a 4d 65 72 67 65 2e 6d |MacTools|:Merge.m|
|00000d10| 70 77 0d 09 3a 4d 61 63 | 54 6f 6f 6c 73 3a 55 6e |pw..:Mac|Tools:Un|
|00000d20| 64 69 66 66 65 72 65 6e | 63 65 2e 6d 70 77 0d 0d |differen|ce.mpw..|
|00000d30| 44 65 62 75 67 20 76 65 | 72 73 69 6f 6e 73 20 61 |Debug ve|rsions a|
|00000d40| 72 65 3a 0d 09 3a 4d 61 | 63 54 6f 6f 6c 73 3a 44 |re:..:Ma|cTools:D|
|00000d50| 69 66 66 65 72 65 6e 63 | 65 44 65 62 75 67 2e 6d |ifferenc|eDebug.m|
|00000d60| 70 77 0d 09 3a 4d 61 63 | 54 6f 6f 6c 73 3a 4d 65 |pw..:Mac|Tools:Me|
|00000d70| 72 67 65 44 65 62 75 67 | 2e 6d 70 77 0d 09 3a 4d |rgeDebug|.mpw..:M|
|00000d80| 61 63 54 6f 6f 6c 73 3a | 55 6e 64 69 66 66 65 72 |acTools:|Undiffer|
|00000d90| 65 6e 63 65 44 65 62 75 | 67 2e 6d 70 77 0d 0d 4e |enceDebu|g.mpw..N|
|00000da0| 6f 74 65 2d 2d 77 65 20 | 75 73 65 20 74 68 65 20 |ote--we |use the |
|00000db0| 22 2e 6d 70 77 22 20 66 | 69 6c 65 20 65 78 74 65 |".mpw" f|ile exte|
|00000dc0| 6e 73 69 6f 6e 20 6f 6e | 20 74 68 65 20 4d 50 57 |nsion on| the MPW|
|00000dd0| 20 74 6f 6f 6c 73 20 73 | 6f 20 74 68 61 74 20 74 | tools s|o that t|
|00000de0| 68 65 20 64 69 66 66 65 | 72 65 6e 63 65 0d 74 6f |he diffe|rence.to|
|00000df0| 6f 6c 73 20 6f 6e 20 6f | 74 68 65 72 20 70 6c 61 |ols on o|ther pla|
|00000e00| 74 66 6f 72 6d 73 20 63 | 61 6e 20 72 65 63 6f 67 |tforms c|an recog|
|00000e10| 6e 69 7a 65 20 74 68 65 | 20 74 6f 6f 6c 73 20 61 |nize the| tools a|
|00000e20| 73 20 62 69 6e 61 72 79 | 20 66 69 6c 65 73 2e 20 |s binary| files. |
|00000e30| 59 6f 75 20 63 61 6e 0d | 72 65 6e 61 6d 65 20 74 |You can.|rename t|
|00000e40| 68 65 73 65 20 66 69 6c | 65 73 20 61 6e 64 20 72 |hese fil|es and r|
|00000e50| 65 6d 6f 76 65 20 74 68 | 65 20 66 69 6c 65 20 65 |emove th|e file e|
|00000e60| 78 74 65 6e 73 69 6f 6e | 20 77 68 65 6e 20 79 6f |xtension| when yo|
|00000e70| 75 20 63 6f 70 79 20 74 | 68 65 20 74 6f 6f 6c 73 |u copy t|he tools|
|00000e80| 20 74 6f 20 79 6f 75 72 | 0d 22 54 6f 6f 6c 73 22 | to your|."Tools"|
|00000e90| 20 6f 72 20 22 55 73 65 | 72 20 43 6f 6d 6d 61 6e | or "Use|r Comman|
|00000ea0| 64 73 22 20 64 69 72 65 | 63 74 6f 72 79 20 69 6e |ds" dire|ctory in|
|00000eb0| 20 79 6f 75 72 20 4d 50 | 57 20 66 6f 6c 64 65 72 | your MP|W folder|
|00000ec0| 2e 0d 0d 52 65 63 65 6e | 74 20 76 65 72 73 69 6f |...Recen|t versio|
|00000ed0| 6e 73 20 6f 66 20 74 68 | 65 73 65 20 74 6f 6f 6c |ns of th|ese tool|
|00000ee0| 73 20 63 61 6e 20 62 65 | 20 66 6f 75 6e 64 20 61 |s can be| found a|
|00000ef0| 74 0d 20 20 66 74 70 3a | 2f 2f 66 74 70 2e 64 6e |t.  ftp:|//ftp.dn|
|00000f00| 61 69 2e 63 6f 6d 2f 75 | 73 65 72 73 2f 61 68 61 |ai.com/u|sers/aha|
|00000f10| 72 70 65 72 2f 45 63 6c | 65 63 74 75 73 4d 65 72 |rper/Ecl|ectusMer|
|00000f20| 67 65 55 74 69 6c 69 74 | 69 65 73 0d 0d 54 6f 20 |geUtilit|ies..To |
|00000f30| 63 6f 6d 70 69 6c 65 20 | 74 68 65 20 72 65 6c 65 |compile |the rele|
|00000f40| 61 73 65 20 76 65 72 73 | 69 6f 6e 73 20 6f 6e 20 |ase vers|ions on |
|00000f50| 4d 69 63 72 6f 73 6f 66 | 74 20 56 69 73 75 61 6c |Microsof|t Visual|
|00000f60| 20 43 2b 2b 20 34 2e 31 | 0d 6f 70 65 6e 20 74 68 | C++ 4.1|.open th|
|00000f70| 65 20 70 72 6f 6a 65 63 | 74 20 66 69 6c 65 73 0d |e projec|t files.|
|00000f80| 0d 57 69 6e 44 69 66 66 | 65 72 65 6e 63 65 2e 6d |.WinDiff|erence.m|
|00000f90| 64 70 0d 57 69 6e 4d 65 | 72 67 65 2e 6d 64 70 0d |dp.WinMe|rge.mdp.|
|00000fa0| 57 69 6e 55 6e 64 69 66 | 66 65 72 65 6e 63 65 2e |WinUndif|ference.|
|00000fb0| 6d 64 70 0d 0d 61 6e 64 | 20 62 75 69 6c 64 2e 20 |mdp..and| build. |
|00000fc0| 54 68 65 20 72 65 6c 65 | 61 73 65 20 76 65 72 73 |The rele|ase vers|
|00000fd0| 69 6f 6e 73 20 6f 66 20 | 74 68 65 20 65 78 65 63 |ions of |the exec|
|00000fe0| 75 74 61 62 6c 65 73 20 | 61 72 65 20 63 72 65 61 |utables |are crea|
|00000ff0| 74 65 64 3a 0d 09 44 69 | 66 66 65 72 65 6e 63 65 |ted:..Di|fference|
|00001000| 52 2e 69 2f 44 69 66 66 | 65 72 65 6e 63 65 0d 09 |R.i/Diff|erence..|
|00001010| 4d 65 72 67 65 52 2e 69 | 2f 4d 65 72 67 65 0d 09 |MergeR.i|/Merge..|
|00001020| 55 6e 64 69 66 66 65 72 | 65 6e 63 65 52 2e 69 2f |Undiffer|enceR.i/|
|00001030| 55 6e 64 69 66 66 65 72 | 65 6e 63 65 0d 54 68 65 |Undiffer|ence.The|
|00001040| 20 64 65 62 75 67 67 69 | 6e 67 20 76 65 72 73 69 | debuggi|ng versi|
|00001050| 6f 6e 73 20 77 6f 6e 27 | 74 20 62 75 69 6c 64 20 |ons won'|t build |
|00001060| 69 6e 20 74 68 69 73 20 | 72 65 6c 65 61 73 65 20 |in this |release |
|00001070| 62 65 63 61 75 73 65 20 | 73 6f 75 72 63 65 20 63 |because |source c|
|00001080| 6f 64 65 20 66 6f 72 0d | 68 65 61 70 20 64 65 62 |ode for.|heap deb|
|00001090| 75 67 67 69 6e 67 20 72 | 6f 75 74 69 6e 65 73 20 |ugging r|outines |
|000010a0| 61 72 65 20 6e 6f 74 20 | 69 6e 63 6c 75 64 65 64 |are not |included|
|000010b0| 2e 20 54 68 65 20 64 65 | 62 75 67 67 69 6e 67 20 |. The de|bugging |
|000010c0| 65 78 65 63 75 74 61 62 | 6c 65 73 2c 20 61 72 65 |executab|les, are|
|000010d0| 20 0d 68 6f 77 65 76 65 | 72 2c 20 73 75 70 70 6c | .howeve|r, suppl|
|000010e0| 69 65 64 2e 0d 0d 54 6f | 20 63 6f 6d 70 69 6c 65 |ied...To| compile|
|000010f0| 20 74 68 65 20 72 65 6c | 65 61 73 65 20 76 65 72 | the rel|ease ver|
|00001100| 73 69 6f 6e 73 20 75 6e | 64 65 72 20 4d 50 57 20 |sions un|der MPW |
|00001110| 61 73 20 73 75 70 70 6c | 69 65 64 20 6f 6e 20 74 |as suppl|ied on t|
|00001120| 68 65 20 43 57 31 30 20 | 47 6f 6c 64 20 64 69 73 |he CW10 |Gold dis|
|00001130| 6b 0d 66 72 6f 6d 20 4d | 65 74 72 6f 77 65 72 6b |k.from M|etrowerk|
|00001140| 73 20 65 78 65 63 75 74 | 65 20 66 69 72 73 74 3a |s execut|e first:|
|00001150| 0d 0d 6d 61 6b 65 20 2d | 66 20 4d 61 63 4d 65 72 |..make -|f MacMer|
|00001160| 67 65 2e 6d 61 6b 65 20 | 63 6c 65 61 6e 0d 6d 61 |ge.make |clean.ma|
|00001170| 6b 65 20 2d 66 20 4d 61 | 63 44 69 66 66 65 72 65 |ke -f Ma|cDiffere|
|00001180| 6e 63 65 2e 6d 61 6b 65 | 20 63 6c 65 61 6e 0d 6d |nce.make| clean.m|
|00001190| 61 6b 65 20 2d 66 20 4d | 61 63 55 6e 64 69 66 66 |ake -f M|acUndiff|
|000011a0| 65 72 65 6e 63 65 2e 6d | 61 6b 65 20 63 6c 65 61 |erence.m|ake clea|
|000011b0| 6e 0d 0d 74 68 65 6e 20 | 65 78 65 63 75 74 65 3a |n..then |execute:|
|000011c0| 0d 0d 6d 61 6b 65 20 2d | 66 20 4d 61 63 4d 65 72 |..make -|f MacMer|
|000011d0| 67 65 2e 6d 61 6b 65 0d | 6d 61 6b 65 20 2d 66 20 |ge.make.|make -f |
|000011e0| 4d 61 63 44 69 66 66 65 | 72 65 6e 63 65 2e 6d 61 |MacDiffe|rence.ma|
|000011f0| 6b 65 0d 6d 61 6b 65 20 | 2d 66 20 4d 61 63 55 6e |ke.make |-f MacUn|
|00001200| 64 69 66 66 65 72 65 6e | 63 65 2e 6d 61 6b 65 0d |differen|ce.make.|
|00001210| 0d 54 68 72 65 65 20 66 | 69 6c 65 73 20 61 72 65 |.Three f|iles are|
|00001220| 20 63 72 65 61 74 65 64 | 3a 0d 09 3a 44 69 66 66 | created|:..:Diff|
|00001230| 65 72 65 6e 63 65 52 2e | 69 3a 44 69 66 66 65 72 |erenceR.|i:Differ|
|00001240| 65 6e 63 65 0d 09 3a 4d | 65 72 67 65 52 2e 69 3a |ence..:M|ergeR.i:|
|00001250| 4d 65 72 67 65 0d 09 3a | 55 6e 64 69 66 66 65 72 |Merge..:|Undiffer|
|00001260| 65 6e 63 65 52 2e 69 3a | 55 6e 64 69 66 66 65 72 |enceR.i:|Undiffer|
|00001270| 65 6e 63 65 0d 0d 28 4e | 6f 74 65 2d 2d 61 20 73 |ence..(N|ote--a s|
|00001280| 74 61 6e 64 61 72 64 20 | 69 6e 73 74 61 6c 6c 20 |tandard |install |
|00001290| 66 72 6f 6d 20 74 68 65 | 20 43 57 31 30 20 54 6f |from the| CW10 To|
|000012a0| 6f 6c 73 20 64 69 73 6b | 20 64 6f 65 73 20 6e 6f |ols disk| does no|
|000012b0| 74 20 70 6c 61 63 65 20 | 74 68 65 20 69 6e 74 65 |t place |the inte|
|000012c0| 72 66 61 63 65 20 66 69 | 6c 65 73 20 0d 61 6e 64 |rface fi|les .and|
|000012d0| 20 6c 69 62 72 61 72 69 | 65 73 20 69 6e 20 74 68 | librari|es in th|
|000012e0| 65 20 65 78 70 65 63 74 | 65 64 20 64 69 72 65 63 |e expect|ed direc|
|000012f0| 74 6f 72 69 65 73 2e 20 | 59 6f 75 20 77 69 6c 6c |tories. |You will|
|00001300| 20 6e 65 65 64 20 74 6f | 20 63 6f 70 79 20 74 68 | need to| copy th|
|00001310| 65 0d 61 70 70 72 6f 70 | 72 69 61 74 65 20 2e 68 |e.approp|riate .h|
|00001320| 20 66 69 6c 65 73 20 74 | 6f 20 4d 57 43 49 6e 63 | files t|o MWCInc|
|00001330| 6c 75 64 65 73 20 61 6e | 64 20 74 68 65 20 61 70 |ludes an|d the ap|
|00001340| 70 72 6f 70 72 69 61 74 | 65 20 6c 69 62 72 61 72 |propriat|e librar|
|00001350| 69 65 73 20 74 6f 20 4d | 57 36 38 4b 4c 69 62 72 |ies to M|W68KLibr|
|00001360| 61 72 69 65 73 0d 61 6e | 64 20 4d 57 50 50 43 4c |aries.an|d MWPPCL|
|00001370| 69 62 72 61 72 69 65 73 | 2e 20 53 65 65 20 74 68 |ibraries|. See th|
|00001380| 65 20 69 6e 73 74 61 6c | 6c 20 69 6e 73 74 72 75 |e instal|l instru|
|00001390| 63 74 69 6f 6e 73 20 6f | 6e 20 74 68 65 20 43 57 |ctions o|n the CW|
|000013a0| 31 30 20 64 69 73 6b 2e | 29 0d 0d 54 6f 20 63 6f |10 disk.|)..To co|
|000013b0| 6d 70 69 6c 65 20 75 6e | 64 65 72 20 74 68 65 20 |mpile un|der the |
|000013c0| 4d 65 74 72 6f 77 65 72 | 6b 73 20 43 57 31 30 20 |Metrower|ks CW10 |
|000013d0| 69 6e 74 65 67 72 61 74 | 65 64 20 65 6e 76 69 72 |integrat|ed envir|
|000013e0| 6f 6e 6d 65 6e 74 2c 20 | 75 73 65 20 74 68 65 20 |onment, |use the |
|000013f0| 70 72 6f 6a 65 63 74 73 | 0d 69 6e 20 74 68 65 20 |projects|.in the |
|00001400| 22 4d 65 74 72 6f 77 65 | 72 6b 73 20 46 6f 6c 64 |"Metrowe|rks Fold|
|00001410| 65 72 22 20 66 6f 6c 64 | 65 72 2e 20 54 6f 20 6d |er" fold|er. To m|
|00001420| 61 6b 65 20 36 38 4b 20 | 74 6f 6f 6c 73 2c 20 6f |ake 68K |tools, o|
|00001430| 70 65 6e 20 65 61 63 68 | 20 6f 66 20 74 68 65 20 |pen each| of the |
|00001440| 70 72 6f 6a 65 63 74 73 | 0d 44 69 66 66 65 72 65 |projects|.Differe|
|00001450| 6e 63 65 36 38 4b 2e 6d | 77 6b 2c 20 4d 65 72 67 |nce68K.m|wk, Merg|
|00001460| 65 36 38 4b 2e 6d 77 6b | 2c 20 61 6e 64 20 55 6e |e68K.mwk|, and Un|
|00001470| 64 69 66 66 65 72 65 6e | 63 65 36 38 4b 2e 6d 77 |differen|ce68K.mw|
|00001480| 6b 20 61 6e 64 20 62 72 | 69 6e 67 20 74 68 65 6d |k and br|ing them|
|00001490| 20 75 70 20 74 6f 20 64 | 61 74 65 2e 0d 52 65 6e | up to d|ate..Ren|
|000014a0| 61 6d 65 20 74 68 65 20 | 72 65 73 75 6c 74 69 6e |ame the |resultin|
|000014b0| 67 20 74 6f 6f 6c 73 20 | 62 79 20 64 65 6c 65 74 |g tools |by delet|
|000014c0| 69 6e 67 20 74 68 65 20 | 22 2e 36 38 4b 22 20 65 |ing the |".68K" e|
|000014d0| 78 74 65 6e 73 69 6f 6e | 2e 20 54 6f 20 6d 61 6b |xtension|. To mak|
|000014e0| 65 20 50 6f 77 65 72 50 | 43 20 6e 61 74 69 76 65 |e PowerP|C native|
|000014f0| 20 74 6f 6f 6c 73 2c 0d | 6f 70 65 6e 20 74 68 65 | tools,.|open the|
|00001500| 20 22 2e 2e 2e 50 50 43 | 2e 6d 77 6b 22 20 66 69 | "...PPC|.mwk" fi|
|00001510| 6c 65 73 2c 20 62 72 69 | 6e 67 20 74 68 65 6d 20 |les, bri|ng them |
|00001520| 75 70 20 74 6f 20 64 61 | 74 65 2c 20 61 6e 64 20 |up to da|te, and |
|00001530| 64 65 6c 65 74 65 20 74 | 68 65 20 22 2e 50 50 43 |delete t|he ".PPC|
|00001540| 22 20 65 78 74 65 6e 73 | 69 6f 6e 0d 66 72 6f 6d |" extens|ion.from|
|00001550| 20 74 68 65 20 6e 61 6d | 65 73 20 6f 66 20 74 68 | the nam|es of th|
|00001560| 65 20 72 65 73 75 6c 74 | 69 6e 67 20 74 6f 6f 6c |e result|ing tool|
|00001570| 73 2e 20 54 6f 20 6d 61 | 6b 65 20 66 61 74 20 74 |s. To ma|ke fat t|
|00001580| 6f 6f 6c 73 2c 20 66 69 | 72 73 74 20 6d 61 6b 65 |ools, fi|rst make|
|00001590| 20 74 68 65 20 36 38 4b | 20 74 6f 6f 6c 73 2c 0d | the 68K| tools,.|
|000015a0| 62 75 74 20 64 6f 6e 27 | 74 20 72 65 6e 61 6d 65 |but don'|t rename|
|000015b0| 20 74 68 65 6d 2e 20 54 | 68 65 6e 20 62 72 69 6e | them. T|hen brin|
|000015c0| 67 20 74 68 65 20 22 2e | 2e 2e 46 41 54 2e 6d 77 |g the ".|..FAT.mw|
|000015d0| 6b 22 20 66 69 6c 65 73 | 20 75 70 20 74 6f 20 64 |k" files| up to d|
|000015e0| 61 74 65 2e 20 4e 6f 74 | 65 2c 20 6f 6e 6c 79 20 |ate. Not|e, only |
|000015f0| 4d 50 57 0d 53 68 65 6c | 6c 20 33 2e 34 64 31 20 |MPW.Shel|l 3.4d1 |
|00001600| 61 6e 64 20 6c 61 74 65 | 72 20 6f 72 20 54 6f 6f |and late|r or Too|
|00001610| 6c 53 65 72 76 65 72 20 | 33 2e 34 64 31 20 6f 72 |lServer |3.4d1 or|
|00001620| 20 6c 61 74 65 72 20 77 | 69 6c 6c 20 75 73 65 20 | later w|ill use |
|00001630| 74 68 65 20 50 6f 77 65 | 72 50 43 20 63 6f 64 65 |the Powe|rPC code|
|00001640| 20 69 6e 20 61 0d 66 61 | 74 20 4d 50 57 20 74 6f | in a.fa|t MPW to|
|00001650| 6f 6c 2e 20 4f 6c 64 65 | 72 20 76 65 72 73 69 6f |ol. Olde|r versio|
|00001660| 6e 73 20 6f 66 20 4d 50 | 57 20 77 69 6c 6c 20 65 |ns of MP|W will e|
|00001670| 78 65 63 75 74 65 20 74 | 68 65 20 36 38 4b 20 63 |xecute t|he 68K c|
|00001680| 6f 64 65 20 69 6e 20 65 | 6d 75 6c 61 74 69 6f 6e |ode in e|mulation|
|00001690| 2e 0d 0d 54 6f 20 63 6f | 6d 70 69 6c 65 20 6f 6e |...To co|mpile on|
|000016a0| 20 4e 65 78 74 3a 0d 0d | 6d 61 6b 65 20 2d 66 20 | Next:..|make -f |
|000016b0| 4e 65 78 74 4d 65 72 67 | 65 2e 6d 61 6b 65 20 63 |NextMerg|e.make c|
|000016c0| 6c 65 61 6e 0d 6d 61 6b | 65 20 2d 66 20 4e 65 78 |lean.mak|e -f Nex|
|000016d0| 74 4d 65 72 67 65 2e 6d | 61 6b 65 0d 6d 61 6b 65 |tMerge.m|ake.make|
|000016e0| 20 2d 66 20 4e 65 78 74 | 44 69 66 66 65 72 65 6e | -f Next|Differen|
|000016f0| 63 65 2e 6d 61 6b 65 20 | 63 6c 65 61 6e 0d 6d 61 |ce.make |clean.ma|
|00001700| 6b 65 20 2d 66 20 4e 65 | 78 74 44 69 66 66 65 72 |ke -f Ne|xtDiffer|
|00001710| 65 6e 63 65 2e 6d 61 6b | 65 0d 6d 61 6b 65 20 2d |ence.mak|e.make -|
|00001720| 66 20 4e 65 78 74 55 6e | 64 69 66 66 65 72 65 6e |f NextUn|differen|
|00001730| 63 65 2e 6d 61 6b 65 20 | 63 6c 65 61 6e 0d 6d 61 |ce.make |clean.ma|
|00001740| 6b 65 20 2d 66 20 4e 65 | 78 74 55 6e 64 69 66 66 |ke -f Ne|xtUndiff|
|00001750| 65 72 65 6e 63 65 2e 6d | 61 6b 65 0d 0d 33 20 66 |erence.m|ake..3 f|
|00001760| 69 6c 65 73 20 61 72 65 | 20 63 72 65 61 74 65 64 |iles are| created|
|00001770| 3a 0d 44 65 72 69 76 65 | 64 44 69 66 66 65 72 65 |:.Derive|dDiffere|
|00001780| 6e 63 65 2e 69 2f 44 69 | 66 66 65 72 65 6e 63 65 |nce.i/Di|fference|
|00001790| 0d 44 65 72 69 76 65 64 | 55 6e 64 69 66 66 65 72 |.Derived|Undiffer|
|000017a0| 65 6e 63 65 2e 69 2f 55 | 6e 64 69 66 66 65 72 65 |ence.i/U|ndiffere|
|000017b0| 6e 63 65 0d 44 65 72 69 | 76 65 64 4d 65 72 67 65 |nce.Deri|vedMerge|
|000017c0| 2e 69 2f 4d 65 72 67 65 | 0d 0d 75 73 61 67 65 3a |.i/Merge|..usage:|
|000017d0| 20 44 69 66 66 65 72 65 | 6e 63 65 20 53 6f 75 72 | Differe|nce Sour|
|000017e0| 63 65 50 61 74 68 20 44 | 65 73 74 69 6e 61 74 69 |cePath D|estinati|
|000017f0| 6f 6e 50 61 74 68 20 3e | 44 69 66 66 65 72 65 6e |onPath >|Differen|
|00001800| 63 65 53 63 72 69 70 74 | 46 69 6c 65 0d 0d 50 72 |ceScript|File..Pr|
|00001810| 6f 64 75 63 65 73 20 6f | 6e 20 73 74 64 6f 75 74 |oduces o|n stdout|
|00001820| 20 61 20 66 69 6c 65 20 | 74 68 61 74 20 73 74 6f | a file |that sto|
|00001830| 72 65 73 20 74 68 65 20 | 63 68 61 6e 67 65 73 20 |res the |changes |
|00001840| 69 6e 20 74 68 65 20 66 | 69 6c 65 73 20 69 6e 20 |in the f|iles in |
|00001850| 74 68 65 20 74 72 65 65 | 20 44 65 73 74 69 6e 61 |the tree| Destina|
|00001860| 74 69 6f 6e 50 61 74 68 | 0d 74 68 61 74 20 61 72 |tionPath|.that ar|
|00001870| 65 20 6e 6f 74 20 69 6e | 20 53 6f 75 72 63 65 50 |e not in| SourceP|
|00001880| 61 74 68 2e 20 54 68 69 | 73 20 69 73 20 75 73 65 |ath. Thi|s is use|
|00001890| 66 75 6c 20 66 6f 72 20 | 62 61 63 6b 75 70 73 2c |ful for |backups,|
|000018a0| 20 73 74 6f 72 69 6e 67 | 20 73 6d 61 6c 6c 65 72 | storing| smaller|
|000018b0| 20 63 6f 70 69 65 73 20 | 6f 66 20 6d 6f 64 69 66 | copies |of modif|
|000018c0| 69 65 64 0d 66 69 6c 65 | 20 74 72 65 65 73 20 61 |ied.file| trees a|
|000018d0| 6e 64 20 62 65 61 6d 69 | 6e 67 20 63 68 61 6e 67 |nd beami|ng chang|
|000018e0| 65 73 20 69 6e 20 66 69 | 6c 65 20 74 72 65 65 73 |es in fi|le trees|
|000018f0| 20 74 68 72 6f 75 67 68 | 20 61 20 73 6c 6f 77 20 | through| a slow |
|00001900| 77 69 72 65 2e 20 4e 6f | 74 65 3a 20 6f 6e 20 4d |wire. No|te: on M|
|00001910| 61 63 69 6e 74 6f 73 68 | 0d 74 68 65 20 53 6f 75 |acintosh|.the Sou|
|00001920| 72 63 65 50 61 74 68 20 | 61 6e 64 20 44 65 73 74 |rcePath |and Dest|
|00001930| 69 6e 61 74 69 6f 6e 50 | 61 74 68 20 6d 75 73 74 |inationP|ath must|
|00001940| 20 65 69 74 68 65 72 20 | 62 65 20 66 75 6c 6c 79 | either |be fully|
|00001950| 20 71 75 61 6c 69 66 69 | 65 64 20 70 61 74 68 73 | qualifi|ed paths|
|00001960| 20 28 73 74 61 72 74 69 | 6e 67 20 77 69 74 68 0d | (starti|ng with.|
|00001970| 74 68 65 20 6e 61 6d 65 | 20 6f 66 20 61 20 64 69 |the name| of a di|
|00001980| 73 6b 29 2c 20 6f 72 20 | 6d 75 73 74 20 73 74 61 |sk), or |must sta|
|00001990| 72 74 20 77 69 74 68 20 | 61 20 22 3a 22 2e 0d 0d |rt with |a ":"...|
|000019a0| 41 6e 79 20 66 69 6c 65 | 20 6f 72 20 64 69 72 65 |Any file| or dire|
|000019b0| 63 74 6f 72 79 20 6e 61 | 6d 65 20 28 65 78 63 65 |ctory na|me (exce|
|000019c0| 70 74 20 74 68 6f 73 65 | 20 6c 69 73 74 65 64 20 |pt those| listed |
|000019d0| 6f 6e 20 74 68 65 20 63 | 6f 6d 6d 61 6e 64 20 6c |on the c|ommand l|
|000019e0| 69 6e 65 29 20 62 65 67 | 69 6e 6e 69 6e 67 20 77 |ine) beg|inning w|
|000019f0| 69 74 68 20 22 2e 22 20 | 69 73 0d 69 67 6e 6f 72 |ith "." |is.ignor|
|00001a00| 65 64 2e 20 49 6e 20 61 | 64 64 69 74 69 6f 6e 20 |ed. In a|ddition |
|00001a10| 74 68 65 72 65 20 69 73 | 20 61 20 6c 69 73 74 20 |there is| a list |
|00001a20| 6f 66 20 65 78 74 65 6e | 73 69 6f 6e 73 20 66 6f |of exten|sions fo|
|00001a30| 72 20 66 69 6c 65 73 20 | 61 6e 64 20 64 69 72 65 |r files |and dire|
|00001a40| 63 74 6f 72 69 65 73 20 | 74 68 61 74 20 61 72 65 |ctories |that are|
|00001a50| 20 69 67 6e 6f 72 65 64 | 2e 0d 54 68 65 79 20 63 | ignored|..They c|
|00001a60| 75 72 72 65 6e 74 6c 79 | 20 69 6e 63 6c 75 64 65 |urrently| include|
|00001a70| 3a 0d 0d 69 2c 20 69 64 | 62 2c 20 69 6c 6b 2c 20 |:..i, id|b, ilk, |
|00001a80| 6e 63 62 2c 20 6f 62 6a | 2c 20 70 63 68 2c 20 70 |ncb, obj|, pch, p|
|00001a90| 64 62 2c 20 61 6e 64 20 | 74 6d 70 0d 0d 4c 69 6b |db, and |tmp..Lik|
|00001aa0| 65 20 74 68 65 20 62 69 | 6e 61 72 79 20 6e 61 6d |e the bi|nary nam|
|00001ab0| 65 73 20 65 78 74 65 6e | 73 69 6f 6e 73 20 62 65 |es exten|sions be|
|00001ac0| 6c 6f 77 20 74 68 69 73 | 20 6c 69 73 74 20 63 61 |low this| list ca|
|00001ad0| 6e 20 65 61 73 69 6c 79 | 20 62 65 20 75 70 64 61 |n easily| be upda|
|00001ae0| 74 65 64 20 62 79 20 6d | 6f 64 69 66 79 69 6e 67 |ted by m|odifying|
|00001af0| 0d 69 67 6e 6f 72 65 45 | 78 74 65 6e 73 69 6f 6e |.ignoreE|xtension|
|00001b00| 73 20 6e 65 61 72 20 74 | 68 65 20 74 6f 70 20 6f |s near t|he top o|
|00001b10| 66 20 69 6f 2e 63 0d 0d | 42 69 6e 61 72 79 20 66 |f io.c..|Binary f|
|00001b20| 69 6c 65 73 20 61 72 65 | 20 73 74 6f 72 65 64 20 |iles are| stored |
|00001b30| 69 6e 20 41 53 43 49 49 | 20 28 68 65 78 69 64 65 |in ASCII| (hexide|
|00001b40| 63 69 6d 61 6c 29 20 61 | 6e 64 20 61 72 65 20 6e |cimal) a|nd are n|
|00001b50| 6f 74 20 73 74 6f 72 65 | 64 20 61 73 20 64 69 66 |ot store|d as dif|
|00001b60| 66 65 72 65 6e 63 65 73 | 2c 20 69 2e 65 2e 0d 74 |ferences|, i.e..t|
|00001b70| 68 65 79 20 74 61 6b 65 | 20 61 73 20 6d 75 63 68 |hey take| as much|
|00001b80| 20 73 70 61 63 65 20 61 | 73 20 74 68 65 20 68 65 | space a|s the he|
|00001b90| 78 69 64 65 63 69 6d 61 | 6c 20 72 65 70 72 65 73 |xidecima|l repres|
|00001ba0| 65 6e 74 61 74 69 6f 6e | 20 6f 66 20 74 68 65 20 |entation| of the |
|00001bb0| 66 69 6c 65 2e 20 42 69 | 6e 61 72 79 20 66 69 6c |file. Bi|nary fil|
|00001bc0| 65 73 0d 61 72 65 20 74 | 68 6f 73 65 20 74 68 61 |es.are t|hose tha|
|00001bd0| 74 20 64 6f 6e 27 74 20 | 68 61 76 65 20 61 20 27 |t don't |have a '|
|00001be0| 54 45 58 54 27 20 74 79 | 70 65 20 6f 6e 20 4d 61 |TEXT' ty|pe on Ma|
|00001bf0| 63 69 6e 74 6f 73 68 20 | 6f 72 20 68 61 76 65 20 |cintosh |or have |
|00001c00| 6f 6e 65 20 6f 66 20 74 | 68 65 20 66 6f 6c 6c 6f |one of t|he follo|
|00001c10| 77 69 6e 67 0d 65 78 74 | 65 6e 73 69 6f 6e 73 20 |wing.ext|ensions |
|00001c20| 6f 6e 20 6f 74 68 65 72 | 20 6d 61 63 68 69 6e 65 |on other| machine|
|00001c30| 73 3a 0d 0d 61 70 73 2c | 20 62 6d 70 2c 20 62 73 |s:..aps,| bmp, bs|
|00001c40| 63 2c 20 64 6c 6c 2c 20 | 65 78 65 2c 20 68 6c 70 |c, dll, |exe, hlp|
|00001c50| 2c 20 69 63 6f 2c 20 69 | 6e 6b 2c 20 6c 69 62 2c |, ico, i|nk, lib,|
|00001c60| 20 6d 64 70 2c 20 6d 70 | 77 2c 20 6d 77 6b 2c 20 | mdp, mp|w, mwk, |
|00001c70| 6e 63 62 2c 20 6f 62 6a | 2c 20 6f 73 2c 20 6f 73 |ncb, obj|, os, os|
|00001c80| 78 2c 20 70 63 68 2c 20 | 0d 70 64 62 2c 20 70 72 |x, pch, |.pdb, pr|
|00001c90| 6a 2c 20 72 65 73 2c 20 | 73 62 72 2c 20 73 63 72 |j, res, |sbr, scr|
|00001ca0| 2c 20 76 63 70 2c 20 77 | 72 69 2c 20 38 62 66 0d |, vcp, w|ri, 8bf.|
|00001cb0| 0d 59 6f 75 20 63 61 6e | 20 65 61 73 69 6c 79 20 |.You can| easily |
|00001cc0| 63 68 61 6e 67 65 20 74 | 68 69 73 20 6c 69 73 74 |change t|his list|
|00001cd0| 20 62 79 20 6d 6f 64 69 | 66 79 69 6e 67 20 62 69 | by modi|fying bi|
|00001ce0| 6e 61 72 79 45 78 74 65 | 6e 73 69 6f 6e 73 20 6e |naryExte|nsions n|
|00001cf0| 65 61 72 20 74 68 65 20 | 74 6f 70 20 6f 66 20 69 |ear the |top of i|
|00001d00| 6f 2e 63 2e 20 53 6f 6d | 65 74 69 6d 65 73 0d 74 |o.c. Som|etimes.t|
|00001d10| 68 65 20 63 6f 64 65 20 | 67 65 74 73 20 65 64 69 |he code |gets edi|
|00001d20| 74 65 64 20 61 6e 64 20 | 73 6f 6d 65 6f 6e 65 20 |ted and |someone |
|00001d30| 66 6f 72 67 65 74 73 20 | 74 6f 20 75 70 64 61 74 |forgets |to updat|
|00001d40| 65 20 74 68 69 73 20 52 | 45 41 44 4d 45 20 66 69 |e this R|EADME fi|
|00001d50| 6c 65 20 77 69 74 68 20 | 61 20 66 69 6c 65 20 65 |le with |a file e|
|00001d60| 78 74 65 6e 73 69 6f 6e | 2c 20 73 6f 0d 69 66 20 |xtension|, so.if |
|00001d70| 79 6f 75 20 6d 69 67 68 | 74 20 77 61 6e 74 20 74 |you migh|t want t|
|00001d80| 6f 20 64 6f 75 62 6c 65 | 20 63 68 65 63 6b 20 74 |o double| check t|
|00001d90| 68 65 20 63 6f 64 65 2e | 0d 0d 49 66 20 79 6f 75 |he code.|..If you|
|00001da0| 72 20 64 69 66 66 65 72 | 65 6e 63 65 20 66 69 6c |r differ|ence fil|
|00001db0| 65 73 20 67 65 74 20 6c | 61 72 67 65 20 62 65 63 |es get l|arge bec|
|00001dc0| 61 75 73 65 20 6f 66 20 | 6d 61 6e 79 20 62 69 6e |ause of |many bin|
|00001dd0| 61 72 79 20 66 69 6c 65 | 73 20 79 6f 75 20 63 61 |ary file|s you ca|
|00001de0| 6e 20 63 6f 6d 70 72 65 | 73 73 20 74 68 65 6d 20 |n compre|ss them |
|00001df0| 74 6f 0d 61 63 68 69 65 | 76 65 20 63 6f 6e 73 69 |to.achie|ve consi|
|00001e00| 64 65 72 61 62 6c 65 20 | 73 61 76 69 6e 67 73 20 |derable |savings |
|00001e10| 6f 66 20 73 70 61 63 65 | 3b 20 77 65 20 6f 66 74 |of space|; we oft|
|00001e20| 65 6e 20 67 65 74 20 38 | 30 25 20 63 6f 6d 70 72 |en get 8|0% compr|
|00001e30| 65 73 73 69 6f 6e 20 75 | 73 69 6e 67 20 53 74 75 |ession u|sing Stu|
|00001e40| 66 66 49 74 2e 0d 0d 75 | 73 61 67 65 3a 20 55 6e |ffIt...u|sage: Un|
|00001e50| 64 69 66 66 65 72 65 6e | 63 65 20 53 6f 75 72 63 |differen|ce Sourc|
|00001e60| 65 50 61 74 68 20 44 69 | 66 66 65 72 65 6e 63 65 |ePath Di|fference|
|00001e70| 53 63 72 69 70 74 46 69 | 6c 65 20 44 65 73 74 69 |ScriptFi|le Desti|
|00001e80| 6e 61 74 69 6f 6e 50 61 | 74 68 0d 0d 52 65 63 72 |nationPa|th..Recr|
|00001e90| 65 61 74 65 73 20 44 65 | 73 74 69 6e 61 74 69 6f |eates De|stinatio|
|00001ea0| 6e 50 61 74 68 20 6f 75 | 74 20 6f 66 20 44 69 66 |nPath ou|t of Dif|
|00001eb0| 66 65 72 65 6e 63 65 53 | 63 72 69 70 74 46 69 6c |ferenceS|criptFil|
|00001ec0| 65 20 61 6e 64 20 53 6f | 75 72 63 65 50 61 74 68 |e and So|urcePath|
|00001ed0| 2e 0d 0d 59 6f 75 20 63 | 61 6e 20 74 68 69 6e 6b |...You c|an think|
|00001ee0| 20 6f 66 20 44 69 66 66 | 65 72 65 6e 63 65 20 61 | of Diff|erence a|
|00001ef0| 6e 64 20 55 6e 64 69 66 | 66 65 72 65 6e 63 65 20 |nd Undif|ference |
|00001f00| 74 68 65 20 73 61 6d 65 | 20 77 61 79 20 79 6f 75 |the same| way you|
|00001f10| 20 74 68 69 6e 6b 20 6f | 66 20 61 20 63 6f 6d 70 | think o|f a comp|
|00001f20| 72 65 73 73 69 6f 6e 0d | 70 72 6f 67 72 61 6d 2e |ression.|program.|
|00001f30| 20 42 6f 74 68 20 70 72 | 6f 67 72 61 6d 73 20 61 | Both pr|ograms a|
|00001f40| 72 65 20 64 65 73 69 67 | 6e 65 64 20 74 6f 20 77 |re desig|ned to w|
|00001f50| 6f 72 6b 20 6f 6e 20 74 | 65 78 74 20 66 69 6c 65 |ork on t|ext file|
|00001f60| 73 20 74 68 61 74 20 61 | 72 65 20 6c 69 6e 65 20 |s that a|re line |
|00001f70| 6f 72 69 65 6e 74 65 64 | 20 28 65 2e 67 2e 0d 63 |oriented| (e.g..c|
|00001f80| 68 61 6e 67 65 73 20 61 | 72 65 20 73 74 6f 72 65 |hanges a|re store|
|00001f90| 64 20 61 73 20 61 20 73 | 65 74 20 6f 66 20 6c 69 |d as a s|et of li|
|00001fa0| 6e 65 20 6f 72 69 65 6e | 74 65 64 20 65 64 69 74 |ne orien|ted edit|
|00001fb0| 69 6e 67 20 63 68 61 6e | 67 65 73 29 2e 20 54 68 |ing chan|ges). Th|
|00001fc0| 65 79 20 61 6c 73 6f 20 | 77 6f 72 6b 20 6f 6e 0d |ey also |work on.|
|00001fd0| 62 69 6e 61 72 79 20 66 | 69 6c 65 73 2c 20 62 75 |binary f|iles, bu|
|00001fe0| 74 20 74 68 65 79 20 64 | 6f 6e 27 74 20 73 61 76 |t they d|on't sav|
|00001ff0| 65 20 61 6e 79 20 73 70 | 61 63 65 20 73 69 6e 63 |e any sp|ace sinc|
|00002000| 65 20 74 68 65 20 66 69 | 6c 65 73 20 61 72 65 20 |e the fi|les are |
|00002010| 73 74 6f 72 65 64 20 69 | 6e 20 41 53 43 49 49 2e |stored i|n ASCII.|
|00002020| 20 41 0d 33 32 20 62 69 | 74 20 68 61 73 68 20 63 | A.32 bi|t hash c|
|00002030| 61 6c 63 75 6c 61 74 65 | 64 20 77 68 65 6e 20 55 |alculate|d when U|
|00002040| 6e 64 69 66 66 65 72 65 | 6e 63 65 20 72 65 63 6f |ndiffere|nce reco|
|00002050| 6e 73 74 72 75 63 74 73 | 20 61 20 74 72 65 65 20 |nstructs| a tree |
|00002060| 65 6e 73 75 72 65 73 20 | 74 68 61 74 20 74 68 65 |ensures |that the|
|00002070| 20 72 65 73 75 6c 74 20 | 69 73 0d 63 6f 72 72 65 | result |is.corre|
|00002080| 63 74 2e 20 49 66 20 61 | 20 66 69 6c 65 20 69 73 |ct. If a| file is|
|00002090| 20 75 6e 63 68 61 6e 67 | 65 64 20 62 79 20 74 68 | unchang|ed by th|
|000020a0| 65 20 64 69 66 66 65 72 | 65 6e 63 65 20 73 63 72 |e differ|ence scr|
|000020b0| 69 70 74 20 77 68 65 6e | 20 69 74 20 69 73 20 55 |ipt when| it is U|
|000020c0| 6e 64 69 66 66 65 72 65 | 6e 63 65 64 2c 0d 74 68 |ndiffere|nced,.th|
|000020d0| 65 20 64 61 74 61 20 69 | 73 20 73 65 74 20 74 6f |e data i|s set to|
|000020e0| 20 74 68 65 20 6f 72 69 | 67 69 6e 61 6c 20 64 61 | the ori|ginal da|
|000020f0| 74 65 2e 20 45 78 65 63 | 75 74 65 20 70 65 72 6d |te. Exec|ute perm|
|00002100| 69 73 73 69 6f 6e 20 69 | 73 20 73 65 74 20 69 66 |ission i|s set if|
|00002110| 20 74 68 65 20 73 6f 75 | 72 63 65 20 66 69 6c 65 | the sou|rce file|
|00002120| 0d 68 61 73 20 65 78 65 | 63 75 74 65 20 70 65 72 |.has exe|cute per|
|00002130| 6d 69 73 73 69 6f 6e 2e | 20 54 68 69 73 20 69 73 |mission.| This is|
|00002140| 20 75 73 65 66 75 6c 20 | 66 6f 72 20 73 63 72 69 | useful |for scri|
|00002150| 70 74 73 2e 20 4f 6e 20 | 4d 61 63 69 6e 74 6f 73 |pts. On |Macintos|
|00002160| 68 20 74 68 65 20 72 65 | 73 6f 75 72 63 65 20 66 |h the re|source f|
|00002170| 6f 72 6b 0d 69 73 20 74 | 61 6b 65 6e 20 66 72 6f |ork.is t|aken fro|
|00002180| 6d 20 74 68 65 20 66 69 | 6c 65 20 69 6e 20 74 68 |m the fi|le in th|
|00002190| 65 20 53 6f 75 72 63 65 | 50 61 74 68 20 69 66 20 |e Source|Path if |
|000021a0| 6f 6e 65 20 65 78 69 73 | 74 73 2e 0d 0d 44 69 66 |one exis|ts...Dif|
|000021b0| 66 65 72 65 6e 63 65 20 | 61 6e 64 20 55 6e 64 69 |ference |and Undi|
|000021c0| 66 66 65 72 65 6e 63 65 | 20 63 61 6e 20 61 6c 73 |fference| can als|
|000021d0| 6f 20 62 65 20 75 73 65 | 64 20 74 6f 20 74 72 61 |o be use|d to tra|
|000021e0| 6e 73 66 65 72 20 65 6e | 74 69 72 65 20 64 69 72 |nsfer en|tire dir|
|000021f0| 65 63 74 6f 72 79 20 74 | 72 65 65 73 20 66 72 6f |ectory t|rees fro|
|00002200| 6d 0d 6f 6e 65 20 70 6c | 61 74 66 6f 72 6d 20 74 |m.one pl|atform t|
|00002210| 6f 20 61 6e 6f 74 68 65 | 72 2e 20 54 6f 20 64 6f |o anothe|r. To do|
|00002220| 20 74 68 69 73 2c 20 64 | 69 66 66 65 72 65 6e 63 | this, d|ifferenc|
|00002230| 65 20 74 68 65 20 74 72 | 65 65 20 61 67 61 69 6e |e the tr|ee again|
|00002240| 73 74 20 61 6e 20 65 6d | 70 74 79 20 64 69 72 65 |st an em|pty dire|
|00002250| 63 74 6f 72 79 2e 0d 54 | 68 69 73 20 63 72 65 61 |ctory..T|his crea|
|00002260| 74 65 73 20 61 20 74 65 | 78 74 20 66 69 6c 65 20 |tes a te|xt file |
|00002270| 77 68 69 63 68 20 79 6f | 75 20 63 61 6e 20 74 72 |which yo|u can tr|
|00002280| 61 6e 73 66 65 72 20 74 | 6f 20 61 6e 6f 74 68 65 |ansfer t|o anothe|
|00002290| 72 20 70 6c 61 74 66 6f | 72 6d 2e 20 43 68 61 6e |r platfo|rm. Chan|
|000022a0| 67 65 20 74 68 65 20 65 | 6e 64 2d 6f 66 2d 6c 69 |ge the e|nd-of-li|
|000022b0| 6e 65 0d 63 68 61 72 61 | 63 74 65 72 20 74 6f 20 |ne.chara|cter to |
|000022c0| 6d 61 74 63 68 20 74 68 | 65 20 63 68 61 72 61 63 |match th|e charac|
|000022d0| 74 65 72 20 65 78 70 65 | 63 74 65 64 20 62 79 20 |ter expe|cted by |
|000022e0| 74 68 61 74 20 70 6c 61 | 74 66 6f 72 6d 20 61 6e |that pla|tform an|
|000022f0| 64 20 74 68 65 6e 20 75 | 6e 64 69 66 66 65 72 65 |d then u|ndiffere|
|00002300| 6e 63 65 0d 61 67 61 69 | 6e 73 74 20 61 6e 20 65 |nce.agai|nst an e|
|00002310| 6d 70 74 79 20 64 69 72 | 65 63 74 6f 72 79 2e 20 |mpty dir|ectory. |
|00002320| 54 68 65 20 72 65 73 75 | 6c 74 69 6e 67 20 64 69 |The resu|lting di|
|00002330| 72 65 63 74 6f 72 79 20 | 77 69 6c 6c 20 68 61 76 |rectory |will hav|
|00002340| 65 20 69 64 65 6e 74 69 | 63 61 6c 20 62 69 6e 61 |e identi|cal bina|
|00002350| 72 79 20 66 69 6c 65 73 | 0d 61 73 20 74 68 65 20 |ry files|.as the |
|00002360| 73 6f 75 72 63 65 2c 20 | 61 6e 64 20 74 65 78 74 |source, |and text|
|00002370| 20 66 69 6c 65 73 20 77 | 69 6c 6c 20 62 65 20 74 | files w|ill be t|
|00002380| 68 65 20 73 61 6d 65 20 | 65 78 63 65 70 74 20 66 |he same |except f|
|00002390| 6f 72 20 74 68 65 20 65 | 6e 64 20 6f 66 20 6c 69 |or the e|nd of li|
|000023a0| 6e 65 20 63 68 61 72 61 | 63 74 65 72 73 2e 0d 0d |ne chara|cters...|
|000023b0| 75 73 61 67 65 3a 20 4d | 65 72 67 65 20 5b 2d 63 |usage: M|erge [-c|
|000023c0| 5d 20 62 61 73 65 50 61 | 74 68 20 6d 6f 64 69 66 |] basePa|th modif|
|000023d0| 69 63 61 74 69 6f 6e 31 | 50 61 74 68 20 5b 6d 6f |ication1|Path [mo|
|000023e0| 64 69 66 69 63 61 74 69 | 6f 6e 32 50 61 74 68 5d |dificati|on2Path]|
|000023f0| 20 2e 2e 2e 20 64 65 73 | 74 69 6e 61 74 69 6f 6e | ... des|tination|
|00002400| 50 61 74 68 0d 20 2d 63 | 20 73 68 6f 77 73 20 61 |Path. -c| shows a|
|00002410| 6c 6c 20 63 68 61 6e 67 | 65 73 20 65 76 65 6e 20 |ll chang|es even |
|00002420| 69 66 20 6e 6f 20 63 6f | 6c 6c 69 73 69 6f 6e 73 |if no co|llisions|
|00002430| 20 6f 63 63 75 72 0d 0d | 4d 65 72 67 65 73 20 61 | occur..|Merges a|
|00002440| 6c 6c 20 63 68 61 6e 67 | 65 73 20 69 6e 20 74 68 |ll chang|es in th|
|00002450| 65 20 66 69 6c 65 73 20 | 63 6f 6e 74 61 69 6e 65 |e files |containe|
|00002460| 64 20 69 6e 20 6d 6f 64 | 69 66 69 63 61 74 69 6f |d in mod|ificatio|
|00002470| 6e 31 50 61 74 68 2c 20 | 5b 6d 6f 64 69 66 69 63 |n1Path, |[modific|
|00002480| 61 74 69 6f 6e 32 50 61 | 74 68 5d 2c 20 2e 2e 2e |ation2Pa|th], ...|
|00002490| 0d 74 68 61 74 20 68 61 | 76 65 20 62 65 65 6e 20 |.that ha|ve been |
|000024a0| 6d 61 64 65 20 74 6f 20 | 62 61 73 65 50 61 74 68 |made to |basePath|
|000024b0| 20 69 6e 74 6f 20 74 68 | 65 20 6e 65 77 20 70 61 | into th|e new pa|
|000024c0| 74 68 20 64 65 73 74 69 | 6e 61 74 69 6f 6e 50 61 |th desti|nationPa|
|000024d0| 74 68 2e 20 43 68 61 6e | 67 65 73 20 61 72 65 0d |th. Chan|ges are.|
|000024e0| 61 75 74 6f 6d 61 74 69 | 63 61 6c 6c 79 20 6d 65 |automati|cally me|
|000024f0| 72 67 65 64 2e 20 49 66 | 20 74 77 6f 20 6f 72 20 |rged. If| two or |
|00002500| 6d 6f 72 65 20 70 65 6f | 70 6c 65 20 63 68 61 6e |more peo|ple chan|
|00002510| 67 65 20 74 68 65 20 73 | 61 6d 65 20 6c 69 6e 65 |ge the s|ame line|
|00002520| 73 20 61 20 63 6f 6c 6c | 69 73 69 6f 6e 20 6f 63 |s a coll|ision oc|
|00002530| 63 75 72 73 0d 61 6e 64 | 20 61 6c 6c 20 63 68 61 |curs.and| all cha|
|00002540| 6e 67 65 73 20 61 72 65 | 20 6c 69 73 74 65 64 20 |nges are| listed |
|00002550| 73 65 70 61 72 61 74 65 | 6c 79 20 69 6e 20 74 68 |separate|ly in th|
|00002560| 65 20 6d 65 72 67 65 64 | 20 66 69 6c 65 2e 20 54 |e merged| file. T|
|00002570| 68 65 20 6d 65 72 67 65 | 64 20 66 69 6c 65 20 69 |he merge|d file i|
|00002580| 73 20 72 65 6e 61 6d 65 | 64 0d 62 79 20 70 72 65 |s rename|d.by pre|
|00002590| 70 65 6e 64 69 6e 67 20 | 61 20 22 21 22 20 74 6f |pending |a "!" to|
|000025a0| 20 74 68 65 20 6e 61 6d | 65 20 73 6f 20 79 6f 75 | the nam|e so you|
|000025b0| 20 63 61 6e 20 65 61 73 | 69 6c 79 20 66 69 6e 64 | can eas|ily find|
|000025c0| 20 66 69 6c 65 73 20 74 | 68 61 74 20 63 6f 6e 74 | files t|hat cont|
|000025d0| 61 69 6e 20 63 6f 6c 6c | 69 73 69 6f 6e 73 2e 0d |ain coll|isions..|
|000025e0| 49 66 20 79 6f 75 20 63 | 68 6f 6f 73 65 20 74 68 |If you c|hoose th|
|000025f0| 65 20 22 2d 63 22 20 6f | 70 74 69 6f 6e 20 61 6c |e "-c" o|ption al|
|00002600| 6c 20 63 68 61 6e 67 65 | 73 20 61 72 65 20 6c 69 |l change|s are li|
|00002610| 73 74 65 64 20 61 73 20 | 63 6f 6c 6c 69 73 69 6f |sted as |collisio|
|00002620| 6e 73 2c 20 77 68 69 63 | 68 20 6d 61 79 20 62 65 |ns, whic|h may be|
|00002630| 20 75 73 65 66 75 6c 0d | 69 66 20 79 6f 75 20 77 | useful.|if you w|
|00002640| 61 6e 74 20 74 6f 20 72 | 65 76 69 65 77 20 61 6c |ant to r|eview al|
|00002650| 6c 20 74 68 65 20 63 68 | 61 6e 67 65 73 2e 20 41 |l the ch|anges. A|
|00002660| 6c 6d 6f 73 74 20 6e 6f | 62 6f 64 79 20 75 73 65 |lmost no|body use|
|00002670| 73 20 74 68 65 20 2d 63 | 20 6f 70 74 69 6f 6e 2e |s the -c| option.|
|00002680| 0d 0d 49 66 20 62 69 6e | 61 72 79 20 66 69 6c 65 |..If bin|ary file|
|00002690| 73 20 64 69 66 66 65 72 | 20 79 6f 75 20 6d 75 73 |s differ| you mus|
|000026a0| 74 20 6d 65 72 67 65 20 | 74 68 65 6d 20 62 79 20 |t merge |them by |
|000026b0| 68 61 6e 64 2e 20 57 68 | 65 6e 20 74 68 65 79 20 |hand. Wh|en they |
|000026c0| 64 69 66 66 65 72 20 74 | 68 65 79 20 61 72 65 0d |differ t|hey are.|
|000026d0| 6c 69 73 74 65 64 20 61 | 73 20 21 31 46 69 6c 65 |listed a|s !1File|
|000026e0| 2c 20 21 32 46 69 6c 65 | 2c 20 21 33 46 69 6c 65 |, !2File|, !3File|
|000026f0| 2c 20 2e 2e 2e 20 45 61 | 63 68 20 63 6f 72 72 65 |, ... Ea|ch corre|
|00002700| 73 70 6f 6e 64 73 20 74 | 6f 20 74 68 65 20 72 65 |sponds t|o the re|
|00002710| 73 70 65 63 74 69 76 65 | 20 6d 6f 64 69 66 69 63 |spective| modific|
|00002720| 61 74 69 6f 6e 0d 70 61 | 74 68 20 6f 6e 20 74 68 |ation.pa|th on th|
|00002730| 65 20 63 6f 6d 6d 61 6e | 64 20 6c 69 6e 65 2e 20 |e comman|d line. |
|00002740| 46 69 6c 65 73 20 77 68 | 69 63 68 20 6f 63 63 75 |Files wh|ich occu|
|00002750| 72 20 69 6e 20 6d 6f 72 | 65 20 74 68 61 6e 20 6f |r in mor|e than o|
|00002760| 6e 65 20 64 65 72 69 76 | 65 64 20 70 61 74 68 20 |ne deriv|ed path |
|00002770| 28 61 6e 64 0d 77 68 69 | 63 68 20 64 69 66 66 65 |(and.whi|ch diffe|
|00002780| 72 29 20 62 75 74 20 64 | 6f 20 6e 6f 74 20 6f 63 |r) but d|o not oc|
|00002790| 63 75 72 20 69 6e 20 74 | 68 65 20 62 61 73 65 20 |cur in t|he base |
|000027a0| 70 61 74 68 20 61 72 65 | 20 61 6c 73 6f 20 6c 69 |path are| also li|
|000027b0| 73 74 65 64 20 61 73 0d | 21 31 46 69 6c 65 2c 20 |sted as.|!1File, |
|000027c0| 21 32 46 69 6c 65 2c 20 | 21 33 46 69 6c 65 2c 20 |!2File, |!3File, |
|000027d0| 2e 2e 2e 20 61 6e 64 20 | 6e 65 65 64 20 74 6f 20 |... and |need to |
|000027e0| 62 65 20 69 6e 74 65 67 | 72 61 74 65 64 20 62 79 |be integ|rated by|
|000027f0| 20 68 61 6e 64 2e 0d 0d | 54 68 65 20 6d 65 73 73 | hand...|The mess|
|00002800| 61 67 65 20 22 41 44 44 | 45 44 22 20 69 6e 64 69 |age "ADD|ED" indi|
|00002810| 63 61 74 65 73 20 74 68 | 61 74 20 61 20 66 69 6c |cates th|at a fil|
|00002820| 65 20 68 61 73 20 62 65 | 65 6e 20 61 64 64 65 64 |e has be|en added|
|00002830| 20 69 6e 20 6f 6e 65 20 | 6f 66 20 74 68 65 20 64 | in one |of the d|
|00002840| 65 72 69 76 65 64 20 70 | 61 74 68 73 2e 20 54 68 |erived p|aths. Th|
|00002850| 65 0d 6d 65 73 73 61 67 | 65 20 22 52 45 4d 4f 56 |e.messag|e "REMOV|
|00002860| 45 44 22 20 69 6e 64 69 | 63 61 74 65 73 20 74 68 |ED" indi|cates th|
|00002870| 61 74 20 61 20 66 69 6c | 65 20 68 61 73 20 62 65 |at a fil|e has be|
|00002880| 65 6e 20 72 65 6d 6f 76 | 65 64 20 66 72 6f 6d 20 |en remov|ed from |
|00002890| 6f 6e 65 20 6f 66 20 74 | 68 65 20 64 65 72 69 76 |one of t|he deriv|
|000028a0| 65 64 20 70 61 74 68 73 | 2e 0d 54 68 69 73 20 69 |ed paths|..This i|
|000028b0| 73 20 75 73 65 66 75 6c | 20 74 6f 20 68 65 6c 70 |s useful| to help|
|000028c0| 20 66 69 6e 64 20 67 61 | 72 62 61 67 65 20 66 69 | find ga|rbage fi|
|000028d0| 6c 65 73 20 74 68 61 74 | 20 73 6f 6d 65 74 69 6d |les that| sometim|
|000028e0| 65 73 20 64 6f 6e 27 74 | 20 67 65 74 20 72 65 6d |es don't| get rem|
|000028f0| 6f 76 65 64 20 66 72 6f | 6d 20 61 20 73 6f 75 72 |oved fro|m a sour|
|00002900| 63 65 20 74 72 65 65 0d | 62 65 66 6f 72 65 20 61 |ce tree.|before a|
|00002910| 20 6d 65 72 67 65 2e 0d | 0d 46 69 6c 65 73 20 74 | merge..|.Files t|
|00002920| 68 61 74 20 61 72 65 20 | 6e 6f 74 20 6d 6f 64 69 |hat are |not modi|
|00002930| 66 69 65 64 20 64 75 72 | 69 6e 67 20 74 68 65 20 |fied dur|ing the |
|00002940| 6d 65 72 67 65 20 68 61 | 76 65 20 74 68 65 20 73 |merge ha|ve the s|
|00002950| 61 6d 65 20 64 61 74 65 | 20 61 73 20 74 68 65 20 |ame date| as the |
|00002960| 6f 72 69 67 69 6e 61 6c | 20 64 61 74 65 2e 0d 54 |original| date..T|
|00002970| 68 65 20 72 65 73 6f 75 | 63 65 20 66 6f 72 6b 20 |he resou|ce fork |
|00002980| 6f 6e 20 4d 61 63 69 6e | 74 6f 73 68 20 69 73 20 |on Macin|tosh is |
|00002990| 74 61 6b 65 6e 20 66 72 | 6f 6d 20 74 68 65 20 63 |taken fr|om the c|
|000029a0| 6f 70 79 20 69 6e 20 74 | 68 65 20 62 61 73 65 50 |opy in t|he baseP|
|000029b0| 61 74 68 2e 0d 0d 4d 61 | 63 20 61 6e 64 20 4e 65 |ath...Ma|c and Ne|
|000029c0| 78 74 20 68 61 76 65 20 | 74 61 72 67 65 74 73 20 |xt have |targets |
|000029d0| 69 6e 20 74 68 65 69 72 | 20 6d 61 6b 65 20 66 69 |in their| make fi|
|000029e0| 6c 65 73 20 77 68 69 63 | 68 20 69 6e 63 6c 75 64 |les whic|h includ|
|000029f0| 65 20 64 65 62 75 67 2c | 20 69 6e 73 74 61 6c 6c |e debug,| install|
|00002a00| 2c 20 74 65 73 74 20 61 | 6e 64 20 74 65 73 74 44 |, test a|nd testD|
|00002a10| 65 62 75 67 2e 0d 64 65 | 62 75 67 20 72 65 66 65 |ebug..de|bug refe|
|00002a20| 72 73 20 74 6f 20 66 69 | 6c 65 73 20 6e 6f 74 20 |rs to fi|les not |
|00002a30| 69 6e 63 6c 75 64 65 64 | 2e 20 54 68 65 73 65 20 |included|. These |
|00002a40| 66 69 6c 65 73 20 77 65 | 72 65 20 75 73 65 64 20 |files we|re used |
|00002a50| 74 6f 20 74 65 73 74 20 | 74 68 65 20 6d 65 6d 6f |to test |the memo|
|00002a60| 72 79 20 61 6c 6c 6f 63 | 61 74 69 6f 6e 0d 74 6f |ry alloc|ation.to|
|00002a70| 20 6d 61 6b 65 20 73 75 | 72 65 20 74 68 65 72 65 | make su|re there|
|00002a80| 20 77 65 72 65 20 6e 6f | 20 6d 65 6d 6f 72 79 20 | were no| memory |
|00002a90| 6c 65 61 6b 73 2c 20 66 | 72 65 65 20 62 6c 6f 63 |leaks, f|ree bloc|
|00002aa0| 6b 73 20 77 65 72 65 6e | 27 74 20 75 73 65 64 2c |ks weren|'t used,|
|00002ab0| 20 6f 6e 6c 79 20 74 68 | 65 20 63 6f 6e 74 65 6e | only th|e conten|
|00002ac0| 74 73 0d 6f 66 20 62 6c | 6f 63 6b 73 20 77 65 72 |ts.of bl|ocks wer|
|00002ad0| 65 20 75 73 65 64 2c 20 | 70 6c 75 73 20 7a 69 6c |e used, |plus zil|
|00002ae0| 6c 69 6f 6e 73 20 6f 66 | 20 6f 74 68 65 72 20 63 |lions of| other c|
|00002af0| 6f 6e 73 74 65 6e 63 79 | 20 63 68 65 63 6b 73 2e |onstency| checks.|
|00002b00| 20 69 6e 73 74 61 6c 6c | 20 69 73 20 75 73 65 64 | install| is used|
|00002b10| 20 66 6f 72 20 6f 75 72 | 0d 70 75 72 70 6f 73 65 | for our|.purpose|
|00002b20| 73 2c 20 79 6f 75 20 73 | 68 6f 75 6c 64 20 69 6e |s, you s|hould in|
|00002b30| 73 74 61 6c 6c 20 74 68 | 65 20 74 6f 6f 6c 73 20 |stall th|e tools |
|00002b40| 62 79 20 68 61 6e 64 2e | 20 74 65 73 74 20 64 6f |by hand.| test do|
|00002b50| 65 73 20 73 6f 6d 65 20 | 73 69 6d 70 6c 65 20 74 |es some |simple t|
|00002b60| 65 73 74 73 2e 20 74 65 | 73 74 44 65 62 75 67 20 |ests. te|stDebug |
|00002b70| 64 6f 65 73 0d 74 68 65 | 20 73 61 6d 65 20 74 68 |does.the| same th|
|00002b80| 69 6e 67 20 61 73 20 74 | 65 73 74 20 62 75 74 20 |ing as t|est but |
|00002b90| 77 69 74 68 20 61 64 64 | 69 74 69 6f 6e 61 6c 20 |with add|itional |
|00002ba0| 74 65 73 74 73 20 66 6f | 72 20 74 68 65 20 64 65 |tests fo|r the de|
|00002bb0| 62 75 67 20 76 65 72 73 | 69 6f 6e 73 2e 0d 0d 4f |bug vers|ions...O|
|00002bc0| 6e 20 57 69 6e 64 6f 77 | 73 20 72 61 74 68 65 72 |n Window|s rather|
|00002bd0| 20 74 68 61 6e 20 61 64 | 64 69 6e 67 20 74 61 72 | than ad|ding tar|
|00002be0| 67 65 74 73 20 74 6f 20 | 74 68 65 20 6d 61 6b 65 |gets to |the make|
|00002bf0| 66 69 6c 65 2c 20 74 68 | 65 72 65 20 69 73 20 61 |file, th|ere is a|
|00002c00| 20 62 61 74 63 68 20 73 | 63 72 69 70 74 0d 22 57 | batch s|cript."W|
|00002c10| 69 6e 4d 65 72 67 65 54 | 65 73 74 2e 62 61 74 22 |inMergeT|est.bat"|
|00002c20| 20 74 68 61 74 20 64 6f | 65 73 20 74 65 73 74 69 | that do|es testi|
|00002c30| 6e 67 2e 0d 0d 4f 6e 20 | 74 68 65 20 4d 61 63 69 |ng...On |the Maci|
|00002c40| 6e 74 6f 73 68 2c 20 74 | 68 65 20 6f 75 74 70 75 |ntosh, t|he outpu|
|00002c50| 74 20 66 72 6f 6d 20 61 | 20 73 75 63 63 65 73 73 |t from a| success|
|00002c60| 66 75 6c 20 22 6d 61 6b | 65 20 2d 66 20 6d 61 63 |ful "mak|e -f mac|
|00002c70| 6d 65 72 67 65 2e 6d 61 | 6b 65 20 74 65 73 74 22 |merge.ma|ke test"|
|00002c80| 20 69 73 3a 0d 0d 43 4f | 4c 4c 49 53 49 4f 4e 20 | is:..CO|LLISION |
|00002c90| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00002ca0| 20 20 20 20 20 20 20 3a | 4d 65 72 67 65 52 2e 69 |       :|MergeR.i|
|00002cb0| 3a 74 65 73 74 66 69 6c | 65 2e 6f 75 74 0d 46 69 |:testfil|e.out.Fi|
|00002cc0| 6c 65 20 23 31 3a 20 3a | 4d 65 72 67 65 52 2e 69 |le #1: :|MergeR.i|
|00002cd0| 3a 21 74 65 73 74 66 69 | 6c 65 2e 6f 75 74 0d 46 |:!testfi|le.out.F|
|00002ce0| 69 6c 65 20 23 32 3a 20 | 74 65 73 74 66 69 6c 65 |ile #2: |testfile|
|00002cf0| 2e 6d 65 72 67 65 0d 0d | 2a 2a 2a 20 46 69 6c 65 |.merge..|*** File|
|00002d00| 73 20 6d 61 74 63 68 20 | 2a 2a 2a 0d 20 20 20 20 |s match |***.    |
|00002d10| 20 20 20 20 20 20 20 41 | 44 44 45 44 20 20 20 20 |       A|DDED    |
|00002d20| 42 49 4e 41 52 59 20 46 | 49 4c 45 20 20 3a 4d 65 |BINARY F|ILE  :Me|
|00002d30| 72 67 65 52 2e 69 3a 74 | 65 73 74 64 2e 6f 75 74 |rgeR.i:t|estd.out|
|00002d40| 3a 41 6c 6c 43 68 61 72 | 73 2e 4f 53 0d 20 20 20 |:AllChar|s.OS.   |
|00002d50| 20 20 20 20 20 20 20 20 | 52 45 4d 4f 56 45 44 20 |        |REMOVED |
|00002d60| 20 42 49 4e 41 52 59 20 | 46 49 4c 45 20 20 3a 4d | BINARY |FILE  :M|
|00002d70| 65 72 67 65 52 2e 69 3a | 74 65 73 74 64 2e 6f 75 |ergeR.i:|testd.ou|
|00002d80| 74 3a 42 69 6e 61 72 79 | 46 69 6c 65 2e 4f 53 0d |t:Binary|File.OS.|
|00002d90| 43 4f 4c 4c 49 53 49 4f | 4e 20 20 41 44 44 45 44 |COLLISIO|N  ADDED|
|00002da0| 20 20 20 20 42 49 4e 41 | 52 59 20 46 49 4c 45 20 |    BINA|RY FILE |
|00002db0| 20 3a 4d 65 72 67 65 52 | 2e 69 3a 74 65 73 74 64 | :MergeR|.i:testd|
|00002dc0| 2e 6f 75 74 3a 42 69 6e | 61 72 79 46 69 6c 65 31 |.out:Bin|aryFile1|
|00002dd0| 2e 4f 53 0d 20 20 20 20 | 20 20 20 20 20 20 20 52 |.OS.    |       R|
|00002de0| 45 4d 4f 56 45 44 20 20 | 42 49 4e 41 52 59 20 46 |EMOVED  |BINARY F|
|00002df0| 49 4c 45 20 20 3a 4d 65 | 72 67 65 52 2e 69 3a 74 |ILE  :Me|rgeR.i:t|
|00002e00| 65 73 74 64 2e 6f 75 74 | 3a 42 69 6e 61 72 79 46 |estd.out|:BinaryF|
|00002e10| 69 6c 65 33 2e 4f 53 0d | 20 20 20 20 20 20 20 20 |ile3.OS.|        |
|00002e20| 20 20 20 41 44 44 45 44 | 20 20 20 20 20 20 20 20 |   ADDED|        |
|00002e30| 20 20 20 20 20 20 20 20 | 20 3a 4d 65 72 67 65 52 |        | :MergeR|
|00002e40| 2e 69 3a 74 65 73 74 64 | 2e 6f 75 74 3a 46 69 6c |.i:testd|.out:Fil|
|00002e50| 65 54 6f 41 64 64 0d 20 | 20 20 20 20 20 20 20 20 |eToAdd. |        |
|00002e60| 20 20 52 45 4d 4f 56 45 | 44 20 20 20 20 20 20 20 |  REMOVE|D       |
|00002e70| 20 20 20 20 20 20 20 20 | 3a 4d 65 72 67 65 52 2e |        |:MergeR.|
|00002e80| 69 3a 74 65 73 74 64 2e | 6f 75 74 3a 46 69 6c 65 |i:testd.|out:File|
|00002e90| 54 6f 52 65 6d 6f 76 65 | 0d 20 20 20 20 20 20 20 |ToRemove|.       |
|00002ea0| 20 20 20 20 52 45 4d 4f | 56 45 44 20 20 42 49 4e |    REMO|VED  BIN|
|00002eb0| 41 52 59 20 46 49 4c 45 | 20 20 3a 4d 65 72 67 65 |ARY FILE|  :Merge|
|00002ec0| 52 2e 69 3a 74 65 73 74 | 64 2e 6f 75 74 3a 46 69 |R.i:test|d.out:Fi|
|00002ed0| 6c 65 54 6f 52 65 6d 6f | 76 65 2e 4f 53 0d 43 4f |leToRemo|ve.OS.CO|
|00002ee0| 4c 4c 49 53 49 4f 4e 20 | 20 20 20 20 20 20 20 20 |LLISION |        |
|00002ef0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 3a |        |       :|
|00002f00| 4d 65 72 67 65 52 2e 69 | 3a 74 65 73 74 64 2e 6f |MergeR.i|:testd.o|
|00002f10| 75 74 3a 74 65 73 74 61 | 0d 43 4f 4c 4c 49 53 49 |ut:testa|.COLLISI|
|00002f20| 4f 4e 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |ON      |        |
|00002f30| 20 20 20 20 20 20 20 20 | 20 20 3a 4d 65 72 67 65 |        |  :Merge|
|00002f40| 52 2e 69 3a 74 65 73 74 | 64 2e 6f 75 74 3a 74 65 |R.i:test|d.out:te|
|00002f50| 73 74 62 0d 43 4f 4c 4c | 49 53 49 4f 4e 20 20 20 |stb.COLL|ISION   |
|00002f60| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00002f70| 20 20 20 20 20 3a 4d 65 | 72 67 65 52 2e 69 3a 74 |     :Me|rgeR.i:t|
|00002f80| 65 73 74 64 2e 6f 75 74 | 3a 74 65 73 74 63 0d 43 |estd.out|:testc.C|
|00002f90| 4f 4c 4c 49 53 49 4f 4e | 20 20 20 20 20 20 20 20 |OLLISION|        |
|00002fa0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00002fb0| 3a 4d 65 72 67 65 52 2e | 69 3a 74 65 73 74 64 2e |:MergeR.|i:testd.|
|00002fc0| 6f 75 74 3a 74 65 73 74 | 64 0d 20 20 20 20 20 20 |out:test|d.      |
|00002fd0| 20 20 20 20 20 41 44 44 | 45 44 20 20 20 20 20 20 |     ADD|ED      |
|00002fe0| 20 20 20 20 20 20 20 20 | 20 20 20 3a 4d 65 72 67 |        |   :Merg|
|00002ff0| 65 52 2e 69 3a 74 65 73 | 74 64 2e 6f 75 74 3a 74 |eR.i:tes|td.out:t|
|00003000| 65 73 74 64 33 64 30 3a | 74 65 73 74 61 0d 20 20 |estd3d0:|testa.  |
|00003010| 20 20 20 20 20 20 20 20 | 20 41 44 44 45 44 20 20 |        | ADDED  |
|00003020| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 3a |        |       :|
|00003030| 4d 65 72 67 65 52 2e 69 | 3a 74 65 73 74 64 2e 6f |MergeR.i|:testd.o|
|00003040| 75 74 3a 74 65 73 74 64 | 33 64 30 3a 74 65 73 74 |ut:testd|3d0:test|
|00003050| 62 0d 20 20 20 20 20 20 | 20 20 20 20 20 41 44 44 |b.      |     ADD|
|00003060| 45 44 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |ED      |        |
|00003070| 20 20 20 3a 4d 65 72 67 | 65 52 2e 69 3a 74 65 73 |   :Merg|eR.i:tes|
|00003080| 74 64 2e 6f 75 74 3a 74 | 65 73 74 64 33 64 30 3a |td.out:t|estd3d0:|
|00003090| 74 65 73 74 63 0d 20 20 | 20 20 20 20 20 20 20 20 |testc.  |        |
|000030a0| 20 41 44 44 45 44 20 20 | 20 20 20 20 20 20 20 20 | ADDED  |        |
|000030b0| 20 20 20 20 20 20 20 3a | 4d 65 72 67 65 52 2e 69 |       :|MergeR.i|
|000030c0| 3a 74 65 73 74 64 2e 6f | 75 74 3a 74 65 73 74 64 |:testd.o|ut:testd|
|000030d0| 33 64 30 3a 74 65 73 74 | 64 0d 20 20 20 20 20 20 |3d0:test|d.      |
|000030e0| 20 20 20 20 20 20 20 20 | 20 20 42 49 4e 41 52 59 |        |  BINARY|
|000030f0| 20 46 49 4c 45 20 20 3a | 74 65 73 74 64 2e 6d 61 | FILE  :|testd.ma|
|00003100| 63 2e 6d 65 72 67 65 3a | 21 31 42 69 6e 61 72 79 |c.merge:|!1Binary|
|00003110| 46 69 6c 65 31 2e 4f 53 | 0d 20 20 20 20 20 20 20 |File1.OS|.       |
|00003120| 20 20 20 20 20 20 20 20 | 20 42 49 4e 41 52 59 20 |        | BINARY |
|00003130| 46 49 4c 45 20 20 3a 74 | 65 73 74 64 2e 6d 61 63 |FILE  :t|estd.mac|
|00003140| 2e 6d 65 72 67 65 3a 21 | 32 42 69 6e 61 72 79 46 |.merge:!|2BinaryF|
|00003150| 69 6c 65 31 2e 4f 53 0d | 20 20 20 20 20 20 20 20 |ile1.OS.|        |
|00003160| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00003170| 20 20 20 20 20 3a 74 65 | 73 74 64 2e 6d 61 63 2e |     :te|std.mac.|
|00003180| 6d 65 72 67 65 3a 21 74 | 65 73 74 61 0d 20 20 20 |merge:!t|esta.   |
|00003190| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|000031a0| 20 20 20 20 20 20 20 20 | 20 20 3a 74 65 73 74 64 |        |  :testd|
|000031b0| 2e 6d 61 63 2e 6d 65 72 | 67 65 3a 21 74 65 73 74 |.mac.mer|ge:!test|
|000031c0| 62 0d 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |b.      |        |
|000031d0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 3a |        |       :|
|000031e0| 74 65 73 74 64 2e 6d 61 | 63 2e 6d 65 72 67 65 3a |testd.ma|c.merge:|
|000031f0| 21 74 65 73 74 63 0d 20 | 20 20 20 20 20 20 20 20 |!testc. |        |
|00003200| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00003210| 20 20 20 20 3a 74 65 73 | 74 64 2e 6d 61 63 2e 6d |    :tes|td.mac.m|
|00003220| 65 72 67 65 3a 21 74 65 | 73 74 64 0d 20 20 20 20 |erge:!te|std.    |
|00003230| 20 20 20 20 20 20 20 20 | 20 20 20 20 42 49 4e 41 |        |    BINA|
|00003240| 52 59 20 46 49 4c 45 20 | 20 3a 74 65 73 74 64 2e |RY FILE | :testd.|
|00003250| 6d 61 63 2e 6d 65 72 67 | 65 3a 41 6c 6c 43 68 61 |mac.merg|e:AllCha|
|00003260| 72 73 2e 4f 53 0d 20 20 | 20 20 20 20 20 20 20 20 |rs.OS.  |        |
|00003270| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00003280| 20 20 20 3a 74 65 73 74 | 64 2e 6d 61 63 2e 6d 65 |   :test|d.mac.me|
|00003290| 72 67 65 3a 46 69 6c 65 | 54 6f 41 64 64 0d 20 20 |rge:File|ToAdd.  |
|000032a0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|000032b0| 20 20 20 20 20 20 20 20 | 20 20 20 3a 74 65 73 74 |        |   :test|
|000032c0| 64 2e 6d 61 63 2e 6d 65 | 72 67 65 3a 74 65 73 74 |d.mac.me|rge:test|
|000032d0| 64 33 64 30 3a 74 65 73 | 74 61 0d 20 20 20 20 20 |d3d0:tes|ta.     |
|000032e0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|000032f0| 20 20 20 20 20 20 20 20 | 3a 74 65 73 74 64 2e 6d |        |:testd.m|
|00003300| 61 63 2e 6d 65 72 67 65 | 3a 74 65 73 74 64 33 64 |ac.merge|:testd3d|
|00003310| 30 3a 74 65 73 74 62 0d | 20 20 20 20 20 20 20 20 |0:testb.|        |
|00003320| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00003330| 20 20 20 20 20 3a 74 65 | 73 74 64 2e 6d 61 63 2e |     :te|std.mac.|
|00003340| 6d 65 72 67 65 3a 74 65 | 73 74 64 33 64 30 3a 74 |merge:te|std3d0:t|
|00003350| 65 73 74 63 0d 20 20 20 | 20 20 20 20 20 20 20 20 |estc.   |        |
|00003360| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |        |        |
|00003370| 20 20 3a 74 65 73 74 64 | 2e 6d 61 63 2e 6d 65 72 |  :testd|.mac.mer|
|00003380| 67 65 3a 74 65 73 74 64 | 33 64 30 3a 74 65 73 74 |ge:testd|3d0:test|
|00003390| 64 0d 4e 6f 20 64 69 66 | 66 65 72 65 6e 63 65 20 |d.No dif|ference |
|000033a0| 62 65 74 77 65 65 6e 20 | 66 69 6c 65 28 73 29 2e |between |file(s).|
|000033b0| 0d 0d 4c 69 6d 69 74 61 | 74 69 6f 6e 73 0d 0d 54 |..Limita|tions..T|
|000033c0| 68 65 20 75 74 69 6c 69 | 74 69 65 73 20 75 73 65 |he utili|ties use|
|000033d0| 20 74 68 65 20 73 74 61 | 6e 64 61 72 64 20 43 20 | the sta|ndard C |
|000033e0| 6c 69 62 72 61 72 79 20 | 63 61 6c 6c 73 20 74 6f |library |calls to|
|000033f0| 20 6d 61 6e 61 67 65 20 | 66 69 6c 65 73 2e 20 54 | manage |files. T|
|00003400| 68 65 73 65 20 63 61 6c | 6c 73 20 63 75 72 72 65 |hese cal|ls curre|
|00003410| 6e 74 6c 79 0d 6c 69 6d | 69 74 20 74 68 65 20 6c |ntly.lim|it the l|
|00003420| 65 6e 67 74 68 20 6f 66 | 20 61 20 66 69 6c 65 20 |ength of| a file |
|00003430| 70 61 74 68 20 74 6f 20 | 32 35 35 20 63 68 61 72 |path to |255 char|
|00003440| 61 63 74 65 72 73 20 6f | 6e 20 4d 61 63 69 6e 74 |acters o|n Macint|
|00003450| 6f 73 68 2e 20 54 68 69 | 73 20 63 61 6e 20 63 61 |osh. Thi|s can ca|
|00003460| 75 73 65 20 70 72 6f 62 | 6c 65 6d 73 0d 69 66 20 |use prob|lems.if |
|00003470| 79 6f 75 72 20 70 72 6f | 6a 65 63 74 20 68 61 73 |your pro|ject has|
|00003480| 20 64 65 65 70 6c 79 20 | 6e 65 73 74 65 64 20 64 | deeply |nested d|
|00003490| 69 72 65 63 74 6f 72 69 | 65 73 20 61 6e 64 20 6c |irectori|es and l|
|000034a0| 6f 6e 67 20 6e 61 6d 65 | 73 2e 0d 0d 52 65 70 6f |ong name|s...Repo|
|000034b0| 72 74 20 62 75 67 73 20 | 74 6f 20 61 68 61 72 70 |rt bugs |to aharp|
|000034c0| 65 72 40 64 6e 61 69 2e | 63 6f 6d 20 6f 72 20 6a |er@dnai.|com or j|
|000034d0| 61 6e 64 65 72 40 63 32 | 2e 6f 72 67 0d 0d 54 68 |ander@c2|.org..Th|
|000034e0| 65 20 45 63 6c 65 63 74 | 75 73 20 6d 65 72 67 65 |e Eclect|us merge|
|000034f0| 20 75 74 69 6c 69 74 69 | 65 73 20 77 65 72 65 20 | utiliti|es were |
|00003500| 77 72 69 74 74 65 6e 20 | 62 79 20 44 2e 20 4a 6f |written |by D. Jo|
|00003510| 68 6e 20 41 6e 64 65 72 | 73 6f 6e 20 77 68 6f 20 |hn Ander|son who |
|00003520| 69 73 20 61 76 61 69 6c | 61 62 6c 65 20 61 74 3a |is avail|able at:|
|00003530| 0d 0d 6a 61 6e 64 65 72 | 40 63 32 2e 6f 72 67 0d |..jander|@c2.org.|
|00003540| 0d 45 63 6c 65 63 74 75 | 73 20 53 6f 66 74 77 61 |.Eclectu|s Softwa|
|00003550| 72 65 0d 31 31 20 45 6d | 62 61 72 63 61 64 65 72 |re.11 Em|barcader|
|00003560| 6f 20 57 65 73 74 2c 20 | 53 75 69 74 65 20 31 32 |o West, |Suite 12|
|00003570| 30 0d 4f 61 6b 6c 61 6e | 64 2c 20 43 41 20 39 34 |0.Oaklan|d, CA 94|
|00003580| 36 30 37 0d 35 31 30 2d | 34 34 34 2d 36 36 30 35 |607.510-|444-6605|
|00003590| 20 6f 72 20 34 31 35 2d | 37 34 37 2d 39 36 30 39 | or 415-|747-9609|
|000035a0| 0d 0d 54 68 65 20 76 61 | 73 74 20 6d 61 6a 6f 72 |..The va|st major|
|000035b0| 69 74 79 20 6f 66 20 63 | 6f 64 65 20 77 61 73 20 |ity of c|ode was |
|000035c0| 64 65 72 69 76 65 64 20 | 77 69 74 68 20 6c 69 74 |derived |with lit|
|000035d0| 74 6c 65 20 6f 72 20 6e | 6f 20 6d 6f 64 69 66 69 |tle or n|o modifi|
|000035e0| 63 61 74 69 6f 6e 0d 66 | 72 6f 6d 20 47 4e 55 20 |cation.f|rom GNU |
|000035f0| 64 69 66 66 2e 20 47 4e | 55 20 64 69 66 66 20 77 |diff. GN|U diff w|
|00003600| 61 73 20 77 72 69 74 74 | 65 6e 20 62 79 20 4d 69 |as writt|en by Mi|
|00003610| 6b 65 20 48 61 65 72 74 | 65 6c 2c 20 44 61 76 69 |ke Haert|el, Davi|
|00003620| 64 20 48 61 79 65 73 2c | 0d 52 69 63 68 61 72 64 |d Hayes,|.Richard|
|00003630| 20 53 74 61 6c 6c 6d 61 | 6e 2c 20 4c 65 6e 20 54 | Stallma|n, Len T|
|00003640| 6f 77 65 72 20 61 6e 64 | 20 50 61 75 6c 20 45 67 |ower and| Paul Eg|
|00003650| 67 65 72 74 2e 20 54 68 | 65 20 62 61 73 69 63 20 |gert. Th|e basic |
|00003660| 61 6c 67 6f 72 69 74 68 | 6d 20 69 73 0d 64 65 73 |algorith|m is.des|
|00003670| 63 72 69 62 65 64 20 69 | 6e 3a 20 22 41 6e 20 4f |cribed i|n: "An O|
|00003680| 28 4e 44 29 20 44 69 66 | 66 65 72 65 6e 63 65 20 |(ND) Dif|ference |
|00003690| 41 6c 67 6f 72 69 74 68 | 6d 20 61 6e 64 20 69 74 |Algorith|m and it|
|000036a0| 73 20 56 61 72 69 61 74 | 69 6f 6e 73 22 2c 0d 45 |s Variat|ions",.E|
|000036b0| 75 67 65 6e 65 20 4d 79 | 65 72 73 2c 20 41 6c 67 |ugene My|ers, Alg|
|000036c0| 6f 72 69 74 68 6d 69 63 | 61 20 56 6f 6c 2e 20 31 |orithmic|a Vol. 1|
|000036d0| 20 4e 6f 2e 20 32 2c 20 | 31 39 38 36 2c 20 70 20 | No. 2, |1986, p |
|000036e0| 32 35 31 0d 00 00 00 00 | 00 00 00 00 00 00 00 00 |251.....|........|
|000036f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00003700| 00 00 01 00 00 00 01 76 | 00 00 00 76 00 00 00 52 |.......v|...v...R|
|00003710| 65 72 52 50 74 72 54 79 | 70 65 29 20 74 6f 41 63 |erRPtrTy|pe) toAc|
|00003720| 74 69 76 65 4d 61 70 29 | 3b 09 09 09 09 09 09 09 |tiveMap)|;.......|
|00003730| 07 21 52 45 41 44 4d 45 | 02 00 00 00 54 45 58 54 |.!README|....TEXT|
|00003740| 4d 50 53 20 01 00 00 1a | 01 c0 00 00 00 00 5c a5 |MPS ....|......\.|
|00003750| 00 00 54 45 58 54 4d 50 | 53 20 01 00 00 1a 01 c0 |..TEXTMP|S ......|
|00003760| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00003770| 00 00 ae 6e c1 98 00 00 | 36 64 00 00 01 c8 09 45 |...n....|6d.....E|
|00003780| 43 5f 54 4f 5f 50 52 45 | 50 5f 49 56 53 5f 4f 46 |C_TO_PRE|P_IVS_OF|
|00003790| 20 28 47 2e 6f 62 6a 65 | 63 74 53 74 6f 72 65 2e | (G.obje|ctStore.|
|000037a0| 74 68 65 44 6f 63 4f 62 | 6a 65 63 74 2c 20 44 6f |theDocOb|ject, Do|
|000037b0| 63 4f 62 6a 65 63 74 56 | 29 2d 3e 77 68 65 72 65 |cObjectV|)->where|
|000037c0| 53 61 76 65 64 4d 61 70 | 20 3d 20 77 68 65 72 65 |SavedMap| = where|
|000037d0| 53 61 76 65 64 3b 0d 7d | 09 2f 2a 09 45 43 53 61 |Saved;.}|./*.ECSa|
|000037e0| 76 65 09 2a 2f 09 0d 0d | 23 69 66 64 65 66 20 44 |ve.*/...|#ifdef D|
|000037f0| 46 5f 4d 41 43 48 49 4e | 45 5f 4d 41 43 49 4e 54 |F_MACHIN|E_MACINT|
|00003800| 00 00 00 1e 00 2a 00 03 | 02 fa 02 74 00 2a 00 03 |.....*..|...t.*..|
|00003810| 02 d0 02 23 00 00 17 11 | 00 00 00 00 00 00 00 00 |...#....|........|
|00003820| 00 00 00 00 00 48 00 08 | 4d 6f 6e 61 63 6f 00 00 |.....H..|Monaco..|
|00003830| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00003840| 00 00 00 00 00 00 00 00 | 00 03 00 02 00 3e 00 03 |........|.....>..|
|00003850| 02 fa 02 74 00 3e 00 03 | 02 fa 02 74 ae 79 90 f8 |...t.>..|...t.y..|
|00003860| 00 00 0e 42 00 00 0e 42 | 00 00 00 00 01 00 00 00 |...B...B|........|
|00003870| 00 04 00 01 00 01 00 00 | 01 00 00 00 01 76 00 00 |........|.....v..|
|00003880| 00 76 00 00 00 52 03 98 | ef 18 25 d4 00 00 00 1c |.v...R..|..%.....|
|00003890| 00 52 00 01 4d 50 53 52 | 00 01 00 12 4d 57 42 42 |.R..MPSR|....MWBB|
|000038a0| 00 00 00 2a 03 f0 ff ff | 00 00 00 00 00 00 00 00 |...*....|........|
|000038b0| 03 ed ff ff 00 00 00 22 | 00 00 00 00 03 f0 ff ff |......."|........|
|000038c0| 00 00 00 6e 00 00 00 00 | 00 00 00 00 00 00 00 00 |...n....|........|
|000038d0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000038e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000038f0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
+--------+-------------------------+-------------------------+--------+--------+